Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop

pull/79/head
Sami Mokaddem 2021-10-21 11:27:30 +02:00
commit 481bf1201f
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 1 additions and 1 deletions

View File

@ -135,7 +135,7 @@ class AppController extends Controller
if (!empty($user) && !empty($user->user_settings_by_name['ui.bsTheme']['value'])) {
$this->set('bsTheme', $user->user_settings_by_name['ui.bsTheme']['value']);
} else {
$this->set('bsTheme', Configure::read('ui.bsTheme'));
$this->set('bsTheme', Configure::check('ui.bsTheme') ? Configure::read('ui.bsTheme') : 'default');
}
if ($this->modelClass == 'Tags.Tags') {