aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2011-05-12 13:11:33 +0000
committerflop25 <flop25@piwigo.org>2011-05-12 13:11:33 +0000
commite5f831a729f2e3d9265e36b3111acf099aee68da (patch)
tree3de259f4ec02dcbfd9c757e52b9a8cd3b75c318b /admin
parent4224611035ff1ed5de25a237005ddbeb61db07c5 (diff)
merge r10856 from trunk to branch 2.2
bug:2297 stripslashes added git-svn-id: http://piwigo.org/svn/branches/2.2@10857 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/user_list.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/admin/user_list.php b/admin/user_list.php
index 18e9ce2b4..657fa8b3f 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -235,7 +235,7 @@ else if ($conf['double_password_type_in_admin'] == false)
$page['infos'],
sprintf(
l10n('user "%s" added'),
- $_POST['login']
+ stripslashes($_POST['login'])
)
);
}
@@ -384,7 +384,7 @@ DELETE FROM '.USER_GROUP_TABLE.'
$dbfields = array('primary' => array('user_id'), 'update' => array());
$formfields =
- array('nb_image_line', 'nb_line_page', 'theme', 'language',
+ array('nb_image_page', 'theme', 'language',
'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
'show_nb_hits', 'maxheight', 'status', 'enabled_high',
'level');
@@ -559,8 +559,7 @@ if (isset($_POST['pref_submit']))
{
$template->assign(
array(
- 'NB_IMAGE_LINE' => $_POST['nb_image_line'],
- 'NB_LINE_PAGE' => $_POST['nb_line_page'],
+ 'NB_IMAGE_PAGE' => $_POST['nb_image_page'],
'MAXWIDTH' => $_POST['maxwidth'],
'MAXHEIGHT' => $_POST['maxheight'],
'RECENT_PERIOD' => $_POST['recent_period'],
@@ -571,8 +570,7 @@ else
$default_user = get_default_user_info(true);
$template->assign(
array(
- 'NB_IMAGE_LINE' => $default_user['nb_image_line'],
- 'NB_LINE_PAGE' => $default_user['nb_line_page'],
+ 'NB_IMAGE_PAGE' => $default_user['nb_image_page'],
'MAXWIDTH' => $default_user['maxwidth'],
'MAXHEIGHT' => $default_user['maxheight'],
'RECENT_PERIOD' => $default_user['recent_period'],