Ticket #11184: 11184-cats-tags-2.patch

categories.php

@@ -34 +34 @@
 break;
 
 case 'delete':
+        if ( !isset( $_GET['cat_ID'] ) )
+                wp_redirect('categories.php?message=7');
+
         $cat_ID = (int) $_GET['cat_ID'];
         check_admin_referer('delete-category_' .  $cat_ID);
 
@@ -59 +62 @@
         if ( !current_user_can('manage_categories') )
                 wp_die( __('You are not allowed to delete categories.') );
 
-        foreach ( (array) $_GET['delete'] as $cat_ID ) {
+        $cats = $_GET['delete'];
+        foreach ( (array) $cats as $cat_ID ) {
                 $cat_name = get_cat_name($cat_ID);
 
                 // Don't delete the default cats.
@@ -69 +73 @@
                 wp_delete_category($cat_ID);
         }
 
-        wp_safe_redirect( wp_get_referer() );
+        if ( count( (array) $cats ) == 1 )
+                wp_safe_redirect( add_query_arg( 'message', 2, wp_get_referer() ) );
+        else
+                wp_safe_redirect( add_query_arg( 'message', 6, wp_get_referer() ) );
         exit();
 
 break;
@@ -125 +132 @@
 $messages[3] = __('Category updated.');
 $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
+$messages[6] = __('Categories deleted.');
+$messages[7] = __('No categories selected.');
 ?>
 
 <div class="wrap nosubsub">

edit-tags.php

@@ -44 +44 @@
 break;
 
 case 'delete':
+        if ( !isset( $_GET['tag_ID'] ) )
+                wp_redirect('edit-tags.php?message=7');
+
         $tag_ID = (int) $_GET['tag_ID'];
         check_admin_referer('delete-tag_' .  $tag_ID);
 
@@ -81 +84 @@
                         $location = $referer;
         }
 
-        $location = add_query_arg('message', 6, $location);
+        if ( count( (array) $tags ) == 1 )
+                $location = add_query_arg('message', 2, $location);
+        else
+                $location = add_query_arg('message', 6, $location);
         wp_redirect($location);
         exit;
 
@@ -142 +148 @@
 $messages[3] = __('Tag updated.');
 $messages[4] = __('Tag not added.');
 $messages[5] = __('Tag not updated.');
-$messages[6] = __('Tags deleted.'); ?>
+$messages[6] = __('Tags deleted.');
+$messages[7] = __('No tags selected.'); ?>
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>