Changeset 13715 for trunk/wp-admin/includes/schema.php

Timestamp:

03/16/2010 05:17:55 PM (15 years ago)

Author:

wpmuguru

Message:

first pass on optional global terms, see #12589

File:

• trunk/wp-admin/includes/schema.php (modified) (2 diffs)

trunk/wp-admin/includes/schema.php

@@ -660 +660 @@
 
     if ( !is_multisite() ) {
-
-        $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 );
         $users = get_users_of_blog();
@@ -709 +706 @@
         'upload_space_check_disabled' => '0',
         'subdomain_install' => intval( $subdomain_install ),
+        'global_terms_enabled' => global_terms_enabled() ? '1' : '0'
     );
-    if ( is_multisite() )
-        $sitemeta[ 'global_terms_enabled' ] = get_site_option( 'global_terms_enabled', '0' );
-    else
-        $sitemeta[ 'global_terms_enabled' ] = '0';
 
     $insert = '';