aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-06-19 19:28:20 +0000
committerchrisaga <chrisaga@piwigo.org>2006-06-19 19:28:20 +0000
commit0076b2a6ca1327e8c8c478d0898b70071a12de83 (patch)
tree638a86d1e73c4ea79732ac8e5b3c804197501e95 /include/common.inc.php
parentdc6b6ea9be5bb7242b41f1b9608b93fda0896604 (diff)
improve : feature 429 admin layout is fixed sitewise in config_default.inc.php
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1370 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/common.inc.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 8aeafb7bf..b584f67c4 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -198,7 +198,15 @@ if ($user['is_the_guest'])
}
// include template/theme configuration
-list($user['template'], $user['theme']) = explode('/', $user['template']);
+if (basename($_SERVER['SCRIPT_FILENAME']) == 'admin.php')
+{
+ list($user['template'], $user['theme']) = explode('/', $conf['admin_layout']);
+// TODO : replace $conf['admin_layout'] by $user['admin_layout']
+}
+else
+{
+ list($user['template'], $user['theme']) = explode('/', $user['template']);
+}
// TODO : replace initial $user['template'] by $user['layout']
include(