archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue ID 0000429: Value on config_default.inc.php is a default value not defined by default.

Browse source 
Merge BSF r1407:1408 into branch-1_6

git-svn-id: http://piwigo.org/svn/trunk@1410 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2006-06-27 21:14:55 +00:00
commit 10e9114431
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/common.inc.php
View file

@ -190,7 +190,7 @@ if ($user['is_the_guest'])
// include template/theme configuration
if (defined('IN_ADMIN') and IN_ADMIN)
{
list($user['template'], $user['theme']) = explode('/', $conf['admin_layout']);
list($user['template'], $user['theme']) = explode('/', isset($conf['default_admin_layout']) ? $conf['default_admin_layout'] : $user['template']);
// TODO : replace $conf['admin_layout'] by $user['admin_layout']
}
else

8
include/config_default.inc.php
View file

@ -485,6 +485,12 @@ $conf['nbm_max_treatment_timeout_percent'] = 0.8;
// +-----------------------------------------------------------------------+
// Must be user setable in future
$conf['admin_layout']='yoga/dark';
// Default value of admin layout
// Step 1, default_admin_layout is not defined
// null value, user_layout is used for admin layout
// defined value, this value are used for admin layout
// Next on step, default_admin_layout will be used if the ara not checkeg admin layout
// stored on user informations
//$conf['default_admin_layout']='yoga/dark';
?>