Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-12 10:24:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing $_SESSION variable in src/App

Browse source
This commit is contained in:
Hypolite Petovan 2018-08-05 15:56:21 +02:00
parent d9c6c919e8
commit 45de8a28cd
2 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/App.php
View file

@ -1399,16 +1399,12 @@ class App
}
}
if (!empty($_SESSION)) {
$user_theme = defaults($_SESSION, 'theme', $system_theme);
} else {
$user_theme = $system_theme;
}
$user_theme = Core\Session::get('theme', $system_theme);
// Specific mobile theme override
if (($this->is_mobile || $this->is_tablet) && defaults($_SESSION, 'show-mobile', true)) {
if (($this->is_mobile || $this->is_tablet) && Core\Session::get('show-mobile', true)) {
$system_mobile_theme = Config::get('system', 'mobile-theme');
$user_mobile_theme = defaults($_SESSION, 'mobile-theme', $system_mobile_theme);
$user_mobile_theme = Core\Session::get('mobile-theme', $system_mobile_theme);
// --- means same mobile theme as desktop
if (!empty($user_mobile_theme) && $user_mobile_theme !== '---') {