diff options
| author | mistic100 <mistic@piwigo.org> | 2011-05-31 10:24:24 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2011-05-31 10:24:24 +0000 |
| commit | fc8ca62e363c99db1e7124ed96e4fda1d308ad91 (patch) | |
| tree | d9919c2204d74a3b4cbb322bbbd2bf97de78fea6 /admin | |
| parent | 6d5c639c589bcb7a9117ea7cff8c0170fc76120c (diff) | |
backmerge r10857
git-svn-id: http://piwigo.org/svn/branches/2.2@11126 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/user_list.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/admin/user_list.php b/admin/user_list.php index 657fa8b3f..18e9ce2b4 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'), - stripslashes($_POST['login']) + $_POST['login'] ) ); } @@ -384,7 +384,7 @@ DELETE FROM '.USER_GROUP_TABLE.' $dbfields = array('primary' => array('user_id'), 'update' => array()); $formfields = - array('nb_image_page', 'theme', 'language', + array('nb_image_line', 'nb_line_page', 'theme', 'language', 'recent_period', 'maxwidth', 'expand', 'show_nb_comments', 'show_nb_hits', 'maxheight', 'status', 'enabled_high', 'level'); @@ -559,7 +559,8 @@ if (isset($_POST['pref_submit'])) { $template->assign( array( - 'NB_IMAGE_PAGE' => $_POST['nb_image_page'], + 'NB_IMAGE_LINE' => $_POST['nb_image_line'], + 'NB_LINE_PAGE' => $_POST['nb_line_page'], 'MAXWIDTH' => $_POST['maxwidth'], 'MAXHEIGHT' => $_POST['maxheight'], 'RECENT_PERIOD' => $_POST['recent_period'], @@ -570,7 +571,8 @@ else $default_user = get_default_user_info(true); $template->assign( array( - 'NB_IMAGE_PAGE' => $default_user['nb_image_page'], + 'NB_IMAGE_LINE' => $default_user['nb_image_line'], + 'NB_LINE_PAGE' => $default_user['nb_line_page'], 'MAXWIDTH' => $default_user['maxwidth'], 'MAXHEIGHT' => $default_user['maxheight'], 'RECENT_PERIOD' => $default_user['recent_period'], |