Ticket #2789: 2789b.diff

wp-admin/link-categories.php

@@ -356 +356 @@
                 <td nowrap="nowrap"><?php echo htmlentities($row->text_after_all)?></td>
                 <td><?php echo $row->list_limit ?></td>
                 <td><a href="link-categories.php?cat_id=<?php echo $row->cat_id?>&amp;action=Edit" class="edit"><?php _e('Edit') ?></a></td>
-                <td><a href="<?php echo wp_nonce_url("link-categories.php?cat_id=$row->cat_id?>&amp;action=Delete", 'delete-link-category_' . $row->cat_id) ?>" "onclick="return deleteSomething( 'link category', <?php echo $row->cat_id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; link category.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), wp_specialchars($row->cat_name,1)); ?>' );" class="delete"><?php _e('Delete') ?></a></td>
+                <td><?php if (1 == $row->cat_id) { 
+                                        _e('Default');
+                                } else { ?>
+                                <a href="<?php echo wp_nonce_url("link-categories.php?cat_id=$row->cat_id&amp;action=Delete", 'delete-link-category_' . $row->cat_id) ?>" "onclick="return deleteSomething( 'link category', <?php echo $row->cat_id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; link category.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), wp_specialchars($row->cat_name,1)); ?>' );" class="delete"><?php _e('Delete') ?></a>
+                                <?php } ?>
+                                </td>
               </tr>
 <?php
         ++$i;

wp-admin/admin-db.php

@@ -156 +156 @@
         $cat_ID = (int) $cat_ID;
 
         // Don't delete the default cat.
-        if (1 == $cat_ID)
+        if ($cat_ID == get_option('default_category'))
                 return 0;
 
         $category = get_category($cat_ID);
@@ -170 +170 @@
         $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
 
         // 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');
         wp_cache_delete('all_category_ids', 'category');

wp-admin/categories.php

@@ -44 +44 @@
 
         $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));
 
         wp_delete_category($cat_ID);