Changeset 16193

Timestamp:

11/04/2010 08:11:08 PM (14 years ago)

Author:

scribu

Message:

Network Themes cleanup. Props PeteMall. See #14897

File:

• trunk/wp-admin/network/themes.php (modified) (3 diffs)

trunk/wp-admin/network/themes.php

@@ -15 +15 @@
 $action = $wp_list_table->current_action();
 
-$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
 $s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
-$_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
+$_SERVER['REQUEST_URI'] = remove_query_arg(array('network-enable', 'network-disable', 'network-enable-selected', 'network-disable-selected'), $_SERVER['REQUEST_URI']);
 
 if ( $action ) {
@@ -37 +36 @@
             break;
         case 'network-enable-selected':
-            check_admin_referer('bulk-plugins');
-
             $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
             if ( empty($themes) ) {
@@ -48 +45 @@
             update_site_option( 'allowedthemes', $allowed_themes );
             break;
-            case 'network-disable-selected':
-                check_admin_referer('bulk-plugins');
-
-                $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-                if ( empty($themes) ) {
-                    wp_redirect( wp_get_referer() );
-                    exit;
-                }                       
-                foreach( (array) $themes as $theme )
-                    unset( $allowed_themes[ $theme ] );
-                update_site_option( 'allowedthemes', $allowed_themes );
-                break;
-
+        case 'network-disable-selected':
+            $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+            if ( empty($themes) ) {
+                wp_redirect( wp_get_referer() );
+                exit;
+            }                       
+            foreach( (array) $themes as $theme )
+                unset( $allowed_themes[ $theme ] );
+            update_site_option( 'allowedthemes', $allowed_themes );
+            break;
     }
 }