mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Moved USERTHEME definition to allow plugins to modify it's value when required.

Browse Source
This commit is contained in:
Cameron
2016-09-12 10:09:33 -07:00
parent 2bd2b775cf
commit bb544336d9
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
class2.php
View File

@@ -798,13 +798,17 @@ if(isset($pref['e_module_list']) && $pref['e_module_list'])
} }
// //
// P: THEME LOADING // P: THEME LOADING
// //
$sql->db_Mark_Time('Load Theme'); $sql->db_Mark_Time('Load Theme');
if(!defined("USERTHEME" ))
{
define('USERTHEME', (e107::getUser()->getPref('sitetheme') && file_exists(e_THEME.e107::getUser()->getPref('sitetheme')."/theme.php") ? e107::getUser()->getPref('sitetheme') : false));
}
//########### Module redefinable functions ############### //########### Module redefinable functions ###############
if (!function_exists('checkvalidtheme')) if (!function_exists('checkvalidtheme'))
{ {
@@ -1813,6 +1817,8 @@ function init_session()
$uconfig->save(true); $uconfig->save(true);
unset($ut); unset($ut);
} }
} }
elseif ($user->getPref('sitetheme')) elseif ($user->getPref('sitetheme'))
{ {
@@ -1822,11 +1828,9 @@ function init_session()
->remove('sitetheme_deflayout') ->remove('sitetheme_deflayout')
->save(false); ->save(false);
} }
// XXX could go to e_user class as well END
if(!defined("USERTHEME" ))
{
define('USERTHEME', ($user->getPref('sitetheme') && file_exists(e_THEME.$user->getPref('sitetheme')."/theme.php") ? $user->getPref('sitetheme') : false));
}
$user_pref = $user->getPref(); $user_pref = $user->getPref();
} }