archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backmerge r10857

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.2@11126 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2011-05-31 10:24:24 +00:00
parent 6d5c639c58
commit fc8ca62e36
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
admin/user_list.php
View file

@ -235,7 +235,7 @@ else if ($conf['double_password_type_in_admin'] == false)
$page['infos'], $page['infos'],
sprintf( sprintf(
l10n('user "%s" added'), 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()); $dbfields = array('primary' => array('user_id'), 'update' => array());
$formfields = $formfields =
array('nb_image_page', 'theme', 'language', array('nb_image_line', 'nb_line_page', 'theme', 'language',
'recent_period', 'maxwidth', 'expand', 'show_nb_comments', 'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
'show_nb_hits', 'maxheight', 'status', 'enabled_high', 'show_nb_hits', 'maxheight', 'status', 'enabled_high',
'level'); 'level');
@ -559,7 +559,8 @@ if (isset($_POST['pref_submit']))
{ {
$template->assign( $template->assign(
array( 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'], 'MAXWIDTH' => $_POST['maxwidth'],
'MAXHEIGHT' => $_POST['maxheight'], 'MAXHEIGHT' => $_POST['maxheight'],
'RECENT_PERIOD' => $_POST['recent_period'], 'RECENT_PERIOD' => $_POST['recent_period'],
@ -570,7 +571,8 @@ else
$default_user = get_default_user_info(true); $default_user = get_default_user_info(true);
$template->assign( $template->assign(
array( 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'], 'MAXWIDTH' => $default_user['maxwidth'],
'MAXHEIGHT' => $default_user['maxheight'], 'MAXHEIGHT' => $default_user['maxheight'],
'RECENT_PERIOD' => $default_user['recent_period'], 'RECENT_PERIOD' => $default_user['recent_period'],