mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-12 04:31:32 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
ffef8d2417
|
@ -44,9 +44,9 @@ if (!isset($_COOKIE["mydms_session"])) {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
$theme = $user->getTheme();
|
$theme = $user->getTheme();
|
||||||
if (strlen($theme)==0) {
|
if (strlen($theme)==0 || !empty($settings->_overrideTheme)) {
|
||||||
$theme = $settings->_theme;
|
$theme = $settings->_theme;
|
||||||
$user->setTheme($theme);
|
// $user->setTheme($theme);
|
||||||
}
|
}
|
||||||
$lang = $user->getLanguage();
|
$lang = $user->getLanguage();
|
||||||
if (strlen($lang)==0) {
|
if (strlen($lang)==0) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user