aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2009-10-20 19:30:09 +0000
committerrvelices <rv-github@modusoptimus.com>2009-10-20 19:30:09 +0000
commit989343b5c9c0b7abcd23a5426a2b7258b4f95d4b (patch)
treeaecef69ecc304c696dff54f36face9863a5d4e96
parentdc63ea09c3e96e8d747433f53fc0422bde0b0f1e (diff)
merge -r2048 from trunk to branch 2
- avoid php warning in template when debug template option is activated git-svn-id: http://piwigo.org/svn/branches/2.0@4069 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/user_list.php15
1 files changed, 6 insertions, 9 deletions
diff --git a/admin/user_list.php b/admin/user_list.php
index 38f27e927..45e4380a5 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -530,10 +530,7 @@ if ($conf['allow_adviser'])
}
// Display or Hide double password type
-if ($conf['double_password_type_in_admin'])
-{
- $template->assign('Double_Password', true);
-}
+$template->assign('Double_Password', $conf['double_password_type_in_admin'] );
// Filter status options
$status_options[-1] = '------------';
@@ -587,12 +584,12 @@ else
// Template Options
$template->assign('template_options', get_pwg_themes());
-$template->assign('template_selected',
+$template->assign('template_selected',
isset($_POST['pref_submit']) ? $_POST['template'] : get_default_template());
// Language options
$template->assign('language_options', get_languages());
-$template->assign('language_selected',
+$template->assign('language_selected',
isset($_POST['pref_submit']) ? $_POST['language'] : get_default_language());
// Status options
@@ -605,7 +602,7 @@ foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)
}
}
$template->assign('pref_status_options', $pref_status_options);
-$template->assign('pref_status_selected',
+$template->assign('pref_status_selected',
isset($_POST['pref_submit']) ? $_POST['status'] : 'normal');
// associate and dissociate options
@@ -622,7 +619,7 @@ foreach ($conf['available_permission_levels'] as $level)
$level_options[$level] = l10n(sprintf('Level %d', $level));
}
$template->assign('level_options', $level_options);
-$template->assign('level_selected',
+$template->assign('level_selected',
isset($_POST['pref_submit']) ? $_POST['level'] : $default_user['level']);
// +-----------------------------------------------------------------------+
@@ -663,7 +660,7 @@ foreach ($page['filtered_users'] as $num => $local_user)
$visible_user_list[] = $local_user;
}
-// allow plugins to fill template var plugin_user_list_column_titles and
+// allow plugins to fill template var plugin_user_list_column_titles and
// plugin_columns/plugin_actions for each user in the list
$visible_user_list = trigger_event('loc_visible_user_list', $visible_user_list);