Fix assignment of links to the default category when a category is de…

…leted. Props scohoust. fixes #7316 for 2.6 git-svn-id: http://svn.automattic.com/wordpress/branches/2.6@8389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress · Jul 21, 2008 · 582c3ec · 582c3ec
1 parent 580cd63
commit 582c3ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
@@ -10,12 +10,13 @@
 
 	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));
 	}
 
 	$location = 'edit-link-categories.php';

diff --git a/wp-admin/link-category.php b/wp-admin/link-category.php
@@ -28,12 +28,13 @@
 		wp_die(__('Cheatin&#8217; 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() ) {