keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5123 from rabuzarus/20180526_-_load_correct_theme

Browse source 
Bugfix: compute the current theme each time we want to know which theme is beeing used
This commit is contained in:
Hypolite Petovan 2018-05-25 08:14:03 -04:00 committed by GitHub
commit 4aa46272a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/App.php
View file

@ -9,6 +9,8 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use dba;
use Detection\MobileDetect;
@ -1095,9 +1097,10 @@ class App
return '';
}
if (!$this->current_theme) {
$this->computeCurrentTheme();
}
//// @TODO Compute the current theme only once (this behavior has
/// already been implemented, but it didn't work well -
/// https://github.com/friendica/friendica/issues/5092)
$this->computeCurrentTheme();
return $this->current_theme;
}