Changes from trunk/wp-admin/link-category.php at r7537 to branches/2.6/wp-admin/link-category.php at r8392

File:

• branches/2.6/wp-admin/link-category.php (modified) (2 diffs)

branches/2.6/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';
@@ -74 +75 @@
         }
 
-        if ( wp_update_term($cat_ID, 'link_category', $_POST) )
+        $update =  wp_update_term($cat_ID, 'link_category', $_POST);
+
+        if ( $update && !is_wp_error($update) )
                 $location = add_query_arg('message', 3, $location);
         else