aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-06-28 21:36:05 +0000
committerrub <rub@piwigo.org>2006-06-28 21:36:05 +0000
commit7a929a917105c24471b695745e7daf1604ea0b84 (patch)
tree7e51b23700ce536cb1b1c4ce96c6ba2428e38393 /include
parent6d3b4bda28436c93e63b074d440db398610a05e3 (diff)
Issue ID 0000429:
Fix Line too long cf coding convention Merge BSF r1411:1412 into branch-1_6 git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1413 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php8
-rw-r--r--include/config_default.inc.php3
2 files changed, 9 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 741791161..f5abf1ee7 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -190,7 +190,13 @@ if ($user['is_the_guest'])
// include template/theme configuration
if (defined('IN_ADMIN') and IN_ADMIN)
{
- list($user['template'], $user['theme']) = explode('/', isset($conf['default_admin_layout']) ? $conf['default_admin_layout'] : $user['template']);
+ 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
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index fcc87a50b..c0a98eb44 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -489,7 +489,8 @@ $conf['nbm_max_treatment_timeout_percent'] = 0.8;
// 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
+// Next on step 2, default_admin_layout will be used
+// if there are not checked like admin layout
// stored on user informations
//$conf['default_admin_layout']='yoga/dark';