Changeset 1411

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

Location:

branches/branch-1_6/include

Files:

• common.inc.php (modified) (1 diff)
• config_default.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']
 }

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

@@ -486 +486 @@
 
 // Must be user setable in future
-$conf['admin_layout']='yoga/dark';
+// Default value of admin layout
+// Step 1, default_admin_layout is not defined
+//        null value, user_layout is used for admin layout
+//        defined value, this value are used for admin layout
+// Next on step, default_admin_layout will be used if the ara not checkeg admin layout
+// stored on user informations
+//$conf['default_admin_layout']='yoga/dark';
 
 ?>