Issue ID 0000429: Value on config_default.inc.php is a default value not defined by default.

Merge BSF r1407:1408 into branch-1_6

git-svn-id: http://piwigo.org/svn/trunk@1410 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2006-06-27 21:14:55 +00:00
parent 98f8edab44
commit 10e9114431
2 changed files with 8 additions and 2 deletions
+1 -1
View File
@@ -190,7 +190,7 @@ if ($user['is_the_guest'])
// include template/theme configuration
if (defined('IN_ADMIN') and IN_ADMIN)
{
list($user['template'], $user['theme']) = explode('/', $conf['admin_layout']);
list($user['template'], $user['theme']) = explode('/', isset($conf['default_admin_layout']) ? $conf['default_admin_layout'] : $user['template']);
// TODO : replace $conf['admin_layout'] by $user['admin_layout']
}
else