diff options
| author | nikrou <nikrou@piwigo.org> | 2006-06-22 18:17:47 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2006-06-22 18:17:47 +0000 |
| commit | ad45eccd3349d44af4a251ab0f12eb3233cd08b8 (patch) | |
| tree | 2924a4d6832bdd18658f15326f40de2ae4ee9105 /include/common.inc.php | |
| parent | 84536f02755a328ab689106719ba17c79f09f85d (diff) | |
issue 426 step 1 reverted:
svn merge -r1466:1465 .
svn merge -r1463:1462 .
git-svn-id: http://piwigo.org/svn/trunk@1376 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/common.inc.php')
| -rw-r--r-- | include/common.inc.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index 4a0c54a44..8aeafb7bf 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -201,17 +201,9 @@ if ($user['is_the_guest']) list($user['template'], $user['theme']) = explode('/', $user['template']); // TODO : replace initial $user['template'] by $user['layout'] -if (defined('IN_ADMIN') && IN_ADMIN) -{ - $template_root = 'admin'; -} -else -{ - $template_root = 'public'; -} include( PHPWG_ROOT_PATH - .'template/'.$template_root.'/'.$user['template'] + .'template/'.$user['template'] .'/theme/'.$user['theme'] .'/themeconf.inc.php' ); |