aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvdigital <vdigital@piwigo.org>2008-06-23 19:14:19 +0000
committervdigital <vdigital@piwigo.org>2008-06-23 19:14:19 +0000
commitff39a722c4b6a98b1a873f5790611439660aea98 (patch)
tree5722f8207f1a3663f8ef96ecbc7fe5ce07613ee7
parent63267ee0bd5352671df0b9d6ac6ad8923b6a142a (diff)
Fix on Admin theme (No update thru Multi-View Plugin).
git-svn-id: http://piwigo.org/svn/trunk@2394 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/common.inc.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index c9d9feb0c..06eed3757 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -189,19 +189,21 @@ if (is_a_guest())
// template instance
if
(
- defined('IN_ADMIN') and IN_ADMIN and
- isset($user['admin_template']) and
- isset($user['admin_theme'])
+ defined('IN_ADMIN') and IN_ADMIN
)
{
// Admin template
//$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['admin_template'], $user['admin_theme'] );
- $template = new Template(PHPWG_ROOT_PATH.'admin/template/'.$user['admin_template'], $user['admin_theme'] );
+ list($user['admin_template'], $user['admin_theme']) =
+ explode ('/', $conf['admin_layout']);
+ $template = new Template(PHPWG_ROOT_PATH.'admin/template/'
+ . $user['admin_template'], $user['admin_theme'] );
}
else
{
// Classic template
- $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] );
+ $template = new Template(PHPWG_ROOT_PATH.'template/'
+ . $user['template'], $user['theme'] );
}
if (isset($user['internal_status']['guest_must_be_guest'])