X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..refs/tags/wordpress-2.6.2:/wp-admin/link-category.php

diff --git a/wp-admin/link-category.php b/wp-admin/link-category.php
index a67cf2b6..ea647913 100644
--- a/wp-admin/link-category.php
+++ b/wp-admin/link-category.php
@@ -28,12 +28,13 @@ case 'delete':
 		wp_die(__('Cheatin’ uh?'));
 
 	$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';
 	if ( $referer = wp_get_original_referer() ) {
@@ -73,7 +74,9 @@ case 'editedcat':
 			$location = $referer;
 	}
 
-	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
 		$location = add_query_arg('message', 5, $location);