From 69d0dae55d52338e5ef96074e2af2215a93b63fa Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 12 Sep 2007 04:01:54 +0000 Subject: merge -r2088 from branch-1_7 to trunk - urls used in http redirections must not be html escaped (eg. should use & instead of &) git-svn-id: http://piwigo.org/svn/trunk@2089 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/user_list.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'admin/user_list.php') diff --git a/admin/user_list.php b/admin/user_list.php index 8e3e06d65..8845f4ebe 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -440,11 +440,7 @@ DELETE FROM '.USER_GROUP_TABLE.' redirect( PHPWG_ROOT_PATH. 'admin.php'. - get_query_string_diff( - array( - 'start' - ) - ) + get_query_string_diff(array(), false) ); } @@ -834,12 +830,11 @@ foreach ($visible_user_list as $num => $local_user) } $properties = array(); + $properties[] = l10n( sprintf('Level %d', $local_user['level']) ); $properties[] = (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled']; - $properties[] = l10n( sprintf('Level %d', $local_user['level']) ); - $template->assign_block_vars( 'user', array( @@ -859,7 +854,6 @@ foreach ($visible_user_list as $num => $local_user) 'EMAIL' => get_email_address_as_display_text($local_user['email']), 'GROUPS' => $groups_string, 'PROPERTIES' => implode( ',', $properties), - ) ); trigger_action('loc_assign_block_var_local_user_list', $local_user); -- cgit v1.2.3