adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-04 17:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved issue 0000708: Error on synchronization

Browse Source 
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
This commit is contained in:
rub
2007-06-21 21:00:09 +00:00
parent 58dc3aa595
commit 97703aa9de
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/common.inc.php
+15 -1
View File
@@ -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'])
{