aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-03-13 00:00:52 +0000
committerplegall <plg@piwigo.org>2010-03-13 00:00:52 +0000
commit14778ce673277f2df41f963aa70df1cbed427294 (patch)
tree8c723d4d9827876dbf19d2bd581405fc50910860 /include/common.inc.php
parentc396f08708d431c6f7e8656eaca4fd8e440fdd39 (diff)
feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo
manages template/theme in a simpler "theme only level" architecture. It supports multiple level inheritance. git-svn-id: http://piwigo.org/svn/trunk@5123 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/common.inc.php')
-rw-r--r--include/common.inc.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 814eaaf40..9a5ccac90 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -158,15 +158,11 @@ if (is_a_guest())
if (( defined('IN_ADMIN') and IN_ADMIN )
or (defined('PWG_HELP') and PWG_HELP))
{// Admin template
- 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'] );
+ $template = new Template(PHPWG_ROOT_PATH.'admin/themes', $conf['admin_theme']);
}
else
{ // Classic template
- $template = new Template(PHPWG_ROOT_PATH.'template/'
- . $user['template'], $user['theme'] );
+ $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme'] );
}
if (isset($user['internal_status']['guest_must_be_guest'])