diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-27 11:03:10 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-27 11:03:10 +0000 |
commit | 8db1e81228b0e295199f6e3ee8a99d223c48f8c2 (patch) | |
tree | 131d8b23b9e939a9c23f24ec650b343efa918c5c /wp-admin/user-edit.php | |
parent | 13aff523358403d08dc7fcb0d844a2e6c12df41a (diff) | |
download | wordpress-mu-8db1e81228b0e295199f6e3ee8a99d223c48f8c2.tar.gz wordpress-mu-8db1e81228b0e295199f6e3ee8a99d223c48f8c2.tar.xz wordpress-mu-8db1e81228b0e295199f6e3ee8a99d223c48f8c2.zip |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@599 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/user-edit.php')
-rw-r--r-- | wp-admin/user-edit.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 6b0f052..26376b7 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -25,11 +25,9 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) { } $wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer)); -$errors = array(); - // Only allow site admins to edit every user. -if( is_site_admin() == false ) - if( $user_id != $current_user->ID ) $errors = new WP_Error('head', __('You do not have permission to edit this user.')); +if ( !is_site_admin() && ($user_id != $current_user->ID) ) + $errors = new WP_Error('head', __('You do not have permission to edit this user.')); switch ($action) { case 'switchposts': @@ -46,13 +44,14 @@ check_admin_referer('update-user_' . $user_id); if ( !current_user_can('edit_user', $user_id) ) $errors = new WP_Error('head', __('You do not have permission to edit this user.')); -else - if( isset( $errors ) == false ) $errors = edit_user($user_id); + +if ( !isset($errors) ) + $errors = edit_user($user_id); if( !is_wp_error( $errors ) ) { $redirect = "user-edit.php?user_id=$user_id&updated=true"; $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect); - header("Location: $redirect"); + wp_redirect($redirect); exit; } |