diff options
author | rub <rub@piwigo.org> | 2007-06-21 20:49:45 +0000 |
---|---|---|
committer | rub <rub@piwigo.org> | 2007-06-21 20:49:45 +0000 |
commit | ebf2bba815c76a661d686e069ed9fce79d5a2030 (patch) | |
tree | e2794858759939d91909c6b9c66de5c0d9503fa0 /include/common.inc.php | |
parent | abb62a97e2df28674e433867753e511098039c2a (diff) |
Resolved issue 0000708: Error on synchronization
Resolved issue 0000709: Error with $conf['default_admin_layout']
git-svn-id: http://piwigo.org/svn/trunk@2038 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/common.inc.php')
-rw-r--r-- | include/common.inc.php | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index db7546da7..c6ae8c8af 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -170,7 +170,21 @@ if (is_a_guest()) } // template instance -$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] ); +if + ( + defined('IN_ADMIN') and IN_ADMIN and + isset($user['admin_template']) and + isset($user['admin_theme']) + ) +{ + // Admin template + $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['admin_template'], $user['admin_theme'] ); +} +else +{ + // Classic template + $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] ); +} if ($conf['gallery_locked']) { |