diff options
| author | rub <rub@piwigo.org> | 2007-06-21 21:00:09 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2007-06-21 21:00:09 +0000 |
| commit | 97703aa9deebdb6d7e9c3bed2917e78dd39d7be0 (patch) | |
| tree | c4da134869c46b7e18205585a155ed8c83f73b4f /include/common.inc.php | |
| parent | 58dc3aa595dd7630836646e7d52220a973d43e93 (diff) | |
Resolved issue 0000708: Error on synchronization
Resolved issue 0000709: Error with $conf['default_admin_layout']
Merge BSF 2037:2039 into branch-1_7
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2040 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 1ab44143f..db94ed740 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -171,7 +171,21 @@ if ($user['is_the_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']) { |