Changeset 1411 for branches/branch-1_6/include/common.inc.php

Timestamp:

Jun 27, 2006, 11:16:50 PM (18 years ago)

Author:

rub

Message:

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

Merge BSF r1409:1410 into branch-1_6

File:

• branches/branch-1_6/include/common.inc.php (modified) (1 diff)

branches/branch-1_6/include/common.inc.php

@@ -191 +191 @@
 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']
 }