Changeset 8388

Timestamp:

07/21/2008 04:13:23 PM (17 years ago)

Author:

ryan

Message:

Fix assignment of links to the default category when a category is deleted. Props scohoust. fixes #7316 for trunk

Location:

trunk/wp-admin

Files:

• edit-link-categories.php (modified) (1 diff)
• link-category.php (modified) (1 diff)

trunk/wp-admin/edit-link-categories.php

@@ -11 +11 @@
     foreach( (array) $_GET['delete'] as $cat_ID ) {
         $cat_name = get_term_field('name', $cat_ID, 'link_category');
-
+        $default_cat_id = get_option('default_link_category');
+        
         // Don't delete the default cats.
-        if ( $cat_ID == get_option('default_link_category') )
+        if ( $cat_ID == $default_cat_id )
             wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
-        wp_delete_term($cat_ID, 'link_category');
+        wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
     }
 

trunk/wp-admin/link-category.php

@@ -29 +29 @@
 
     $cat_name = get_term_field('name', $cat_ID, 'link_category');
+    $default_cat_id = get_option('default_link_category');
 
     // Don't delete the default cats.
-    if ( $cat_ID == get_option('default_link_category') )
+    if ( $cat_ID == $default_cat_id )
         wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
-    wp_delete_term($cat_ID, 'link_category');
+    wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
 
     $location = 'edit-link-categories.php';