Changeset 4032

Timestamp:

07/23/2006 06:27:00 PM (18 years ago)

Author:

ryan

Message:

Default cat deletion fix from westi. fixes #2789

Location:

branches/2.0/wp-admin

Files:

• admin-db.php (modified) (2 diffs)
• categories.php (modified) (1 diff)

branches/2.0/wp-admin/admin-db.php

@@ -157 +157 @@
 
     // Don't delete the default cat.
-    if (1 == $cat_ID)
+    if ($cat_ID == get_option('default_category'))
         return 0;
 
@@ -171 +171 @@
 
     // TODO: Only set categories to general if they're not in another category already
-    $wpdb->query("UPDATE $wpdb->post2cat SET category_id='1' WHERE category_id='$cat_ID'");
+    $default_cat = get_option('default_category');
+    $wpdb->query("UPDATE $wpdb->post2cat SET category_id='$default_cat' WHERE category_id='$cat_ID'");
 
     wp_cache_delete($cat_ID, 'category');

branches/2.0/wp-admin/categories.php

@@ -45 +45 @@
     $cat_name = get_catname($cat_ID);
 
-    if ( 1 == $cat_ID )
+    // Don't delete the default cats.
+    if ( $cat_ID == get_option('default_category') )
         die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));