aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2006-06-22 19:21:56 +0000
committernikrou <nikrou@piwigo.org>2006-06-22 19:21:56 +0000
commita08cd1a583cdda6a1175b9e1e4c9c184f3112c5d (patch)
treefa452b2a1c572e98848fdd2828944efe52903e7e /include/common.inc.php
parentad45eccd3349d44af4a251ab0f12eb3233cd08b8 (diff)
svn merge -r1366:1371 from branch 1.6 into trunk
git-svn-id: http://piwigo.org/svn/trunk@1377 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..2c9364d38 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 (defined('IN_ADMIN') and IN_ADMIN)
+{
+ 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(