Changeset 12317 for trunk/wp-admin/categories.php

Timestamp:

12/03/2009 01:43:49 AM (16 years ago)

Author:

azaozz

Message:

Fix errors when bulk actions executed on empty list, props nacin, see #11184

File:

• trunk/wp-admin/categories.php (modified) (4 diffs)

trunk/wp-admin/categories.php

@@ -35 +35 @@
 
 case 'delete':
+    if ( !isset( $_GET['cat_ID'] ) ) {
+        wp_redirect('categories.php');
+        exit;
+    }
+
     $cat_ID = (int) $_GET['cat_ID'];
     check_admin_referer('delete-category_' .  $cat_ID);
@@ -41 +46 @@
         wp_die(__('Cheatin’ uh?'));
 
-    $cat_name = get_cat_name($cat_ID);
-
     // Don't delete the default cats.
     if ( $cat_ID == get_option('default_category') )
-        wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+        wp_die( sprintf( __("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
 
     wp_delete_category($cat_ID);
@@ -60 +63 @@
         wp_die( __('You are not allowed to delete categories.') );
 
-    foreach ( (array) $_GET['delete'] as $cat_ID ) {
-        $cat_name = get_cat_name($cat_ID);
-
-        // Don't delete the default cats.
-        if ( $cat_ID == get_option('default_category') )
-            wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+    $cats = (array) $_GET['delete'];
+    $default_cat = get_option('default_category');
+    foreach ( $cats as $cat_ID ) {
+        $cat_ID = (int) $cat_ID;
+
+        // Don't delete the default cat.
+        if ( $cat_ID == $default_cat )
+            wp_die( sprintf( __("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), get_cat_name($cat_ID) ) );
 
         wp_delete_category($cat_ID);
@@ -71 +76 @@
 
     wp_safe_redirect( wp_get_referer() );
-    exit();
+    exit;
 
 break;