2
0
forked from Wavyzz/dolibarr

New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR)

This commit is contained in:
Laurent Destailleur
2013-01-08 13:45:52 +01:00
parent 1f320dc1e7
commit ec3421d59e
3 changed files with 14 additions and 12 deletions

View File

@@ -225,8 +225,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
$forcethemedir=(! empty($conf->global->MAIN_FORCETHEMEDIR) ? $conf->global->MAIN_FORCETHEMEDIR : '');
$dirthemes=array($forcethemedir.'/theme');
if (! empty($conf->modules_parts['themes'])) {
$dirthemes=array_merge(array($forcethemedir.'/theme'),(array) $conf->modules_parts['themes']);
if (! empty($conf->modules_parts['theme'])) {
$dirthemes=array_merge(array($forcethemedir.'/theme'),(array) $conf->modules_parts['theme']);
}
$selected_theme='';