lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: MAIN_FORCETHEME was not working when user set its own theme

Browse Source
This commit is contained in:
Laurent Destailleur 2014-01-12 20:22:35 +01:00
parent 4d298b1891
commit 0f329e72ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/main.inc.php
View File

@ -680,8 +680,8 @@ if (! defined('NOLOGIN'))
if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0 if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
if (isset($user->conf->PRODUIT_LIMIT_SIZE)) $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0 if (isset($user->conf->PRODUIT_LIMIT_SIZE)) $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
// Replace conf->css by personalized value // Replace conf->css by personalized value if theme not forced
if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME) if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
{ {
$conf->theme=$user->conf->MAIN_THEME; $conf->theme=$user->conf->MAIN_THEME;
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";