aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-06-27 21:14:55 +0000
committerrub <rub@piwigo.org>2006-06-27 21:14:55 +0000
commit10e9114431760847d0f1b27893172f768aecf4be (patch)
tree3d3d4a94c840fdc2e270d1b5bf2a429d453f6653 /include
parent98f8edab443d020b2bd1559a52128b36ab16a1c4 (diff)
Issue ID 0000429: Value on config_default.inc.php is a default value not defined by default.
Merge BSF r1407:1408 into branch-1_6 git-svn-id: http://piwigo.org/svn/trunk@1410 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php2
-rw-r--r--include/config_default.inc.php8
2 files changed, 8 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 35b6dd187..741791161 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -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
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 1b0b7b6bb..fcc87a50b 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -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';
?>