Changeset 12933

Timestamp:

02/03/2010 01:00:57 AM (15 years ago)

Author:

wpmuguru

Message:

fix potential global terms inconsistency, props rboren, see #11644

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (4 diffs)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -657 +657 @@
     if ( !is_multisite() ) {
 
-        /* translators: Default category slug */
-        $cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );
-
-        $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 1, 'cat_name' => __('Uncategorized'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
-
-        /* translators: Default link category slug */
-        $cat_slug = sanitize_title( _x( 'Blogroll', 'Default link category slug' ) );
-
-        $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 2, 'cat_name' => __('Blogroll'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
-        $wpdb->query( "INSERT INTO $wpdb->sitecategories (cat_id, cat_name, category_nicename, last_updated) SELECT term_id, `name`, slug, NOW() FROM $wpdb->terms WHERE term_id > 2" );
+        $wpdb->query( "INSERT INTO $wpdb->sitecategories (cat_id, cat_name, category_nicename, last_updated) SELECT term_id, `name`, slug, NOW() FROM $wpdb->terms" );
 
         $site_admins = array( $site_user->user_login );

trunk/wp-admin/includes/upgrade.php

@@ -104 +104 @@
     $cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
 
-    $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-    $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '1', 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+    if ( is_multisite() ) {
+        $cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+        if ( $cat_id == null ) {
+            $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+            $cat_id = $wpdb->insert_id;
+        }
+        update_option('default_category', $cat_id);
+    } else {
+        $cat_id = 1;
+    }
+
+    $wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+    $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+    $cat_tt_id = $wpdb->insert_id;
 
     // Default link category
@@ -112 +124 @@
     $cat_slug = sanitize_title(_x('Blogroll', 'Default link category slug'));
 
-    $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-    $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '2', 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
+    if ( is_multisite() ) {
+        $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+        if ( $blogroll_id == null ) {
+            $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+            $blogroll_id = $wpdb->insert_id;
+        }
+        update_option('default_link_category', $blogroll_id);
+    } else {
+        $blogroll_id = 2;
+    }
+
+    $wpdb->insert( $wpdb->terms, array('term_id' => $blogroll_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+    $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $blogroll_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
+    $blogroll_tt_id = $wpdb->insert_id;
 
     // Now drop in some default links
@@ -154 +178 @@
     foreach ( $default_links as $link ) {
         $wpdb->insert( $wpdb->links, $link);
-        $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 2, 'object_id' => $wpdb->insert_id) );
+        $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $blogroll_tt_id, 'object_id' => $wpdb->insert_id) );
     }
 
@@ -191 +215 @@
                                 'post_content_filtered' => ''
                                 ));
-    $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 1, 'object_id' => 1) );
+    $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
 
     // Default comment

trunk/wp-includes/ms-functions.php

@@ -1420 +1420 @@
     $wpdb->update( $wpdb->options, array('option_value' => ''), array('option_name' => 'admin_email') );
 
-    // Default category
-    $wpdb->insert( $wpdb->terms, array('term_id' => 1, 'name' => __('Uncategorized'), 'slug' => sanitize_title(__('Uncategorized')), 'term_group' => 0) );
-    $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => 1, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1) );
-
-    // Default link category
-    $cat_name = __('Blogroll');
-    $cat_slug = sanitize_title($cat_name);
-
-    $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
-
-    if ( $blogroll_id == null ) {
-        $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
-        $blogroll_id = $wpdb->insert_id;
-    }
-    $wpdb->insert( $wpdb->terms, array('term_id' => $blogroll_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-    $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $blogroll_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 2) );
-    update_option('default_link_category', $blogroll_id);
-
     // remove all perms
     $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE meta_key = %s", $table_prefix.'user_level') );