Changeset 17277 for trunk/wp-admin/users.php

Timestamp:

01/13/2011 12:50:35 AM (16 years ago)

Author:

nacin

Message:

Revert [17275] and [17276]. The rabbit hole is too deep. see #16166.

File:

• trunk/wp-admin/users.php (modified) (16 diffs)

trunk/wp-admin/users.php

@@ -43 +43 @@
 $update = '';
 
-if ( $doaction = $wp_list_table->current_action() ) {
-
-switch ( $doaction ) {
+switch ( $wp_list_table->current_action() ) {
 
 /* Bulk Dropdown menu Role changes */
@@ -51 +49 @@
         check_admin_referer('bulk-users');
 
-        if ( empty($_REQUEST['users']) )
-                break;
+        if ( empty($_REQUEST['users']) ) {
+                wp_redirect($redirect);
+                exit();
+        }
 
         $editable_roles = get_editable_roles();
@@ -66 +66 @@
                         wp_die(__('You can’t edit that user.'));
                 // The new role of the current user must also have promote_users caps
-                if ( $id == $current_user->ID && ! current_user_can('promote_users') ) {
+                if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('promote_users') ) {
                         $update = 'err_admin_role';
                         continue;
@@ -79 +79 @@
         }
 
-        $redirect = add_query_arg( 'update', $update, $redirect );
+        wp_redirect(add_query_arg('update', $update, $redirect));
+        exit();
 
 break;
@@ -89 +90 @@
         check_admin_referer('delete-users');
 
-        if ( empty($_REQUEST['users']) )
-                break;
+        if ( empty($_REQUEST['users']) ) {
+                wp_redirect($redirect);
+                exit();
+        }
 
         if ( ! current_user_can( 'delete_users' ) )
@@ -123 +126 @@
 
         $redirect = add_query_arg( array('delete_count' => $delete_count, 'update' => $update), $redirect);
+        wp_redirect($redirect);
+        exit();
 
 break;
@@ -132 +137 @@
         check_admin_referer('bulk-users');
 
-        if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) )
-                break;
+        if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+                wp_redirect($redirect);
+                exit();
+        }
 
         if ( ! current_user_can( 'delete_users' ) )
@@ -142 +149 @@
         else
                 $userids = $_REQUEST['users'];
-
-        $redirect = false;
 
         include ('admin-header.php');
@@ -187 +192 @@
 </form>
 <?php
-include('./admin-footer.php');
 
 break;
@@ -194 +198 @@
         check_admin_referer('remove-users');
 
-        if ( empty($_REQUEST['users']) )
-                break;
+        if ( empty($_REQUEST['users']) ) {
+                wp_redirect($redirect);
+                exit;
+        }
 
         if ( !current_user_can('remove_users')  )
@@ -217 +223 @@
 
         $redirect = add_query_arg( array('update' => $update), $redirect);
+        wp_redirect($redirect);
+        exit;
 
 break;
@@ -224 +232 @@
         check_admin_referer('bulk-users');
 
-        if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) )
-                break;
+        if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+                wp_redirect($redirect);
+                exit();
+        }
 
         if ( !current_user_can('remove_users') )
@@ -234 +244 @@
         else
                 $userids = $_REQUEST['users'];
-
-        $redirect = false;
 
         include ('admin-header.php');
@@ -272 +280 @@
 </form>
 <?php
-include('./admin-footer.php');
 
 break;
@@ -278 +285 @@
 default:
 
-} // end of the $doaction switch
-
-        if ( $redirect )
-                wp_redirect( $redirect );
-        exit();
-
-} // end of the $doaction if
-elseif ( !empty($_GET['_wp_http_referer']) ) {
+        if ( !empty($_GET['_wp_http_referer']) ) {
                 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
                 exit;
-}
+        }
 
         $wp_list_table->prepare_items();
@@ -379 +379 @@
 </div>
 <?php
+break;
+
+} // end of the $doaction switch
 
 include('./admin-footer.php');