Changeset 12697 for trunk/wp-includes/taxonomy.php

Timestamp:

01/11/2010 09:49:40 PM (16 years ago)

Author:

wpmuguru

Message:

merge in multisite login, wp-includes, See #11644

File:

• trunk/wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-includes/taxonomy.php

@@ -1418 +1418 @@
 
     if ( ! $term_id = is_term($slug) ) {
-        if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
-            return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
-        $term_id = (int) $wpdb->insert_id;
+                if ( !is_multisite() ) {
+                        if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
+                                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                        $term_id = (int) $wpdb->insert_id;
+                } else {
+                    $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
+                        $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
+                        if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id', 'name', 'slug', 'term_group' ) ) )
+                                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                }
     } else if ( is_taxonomy_hierarchical($taxonomy) && !empty($parent) ) {
         // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
         // by incorporating parent slugs.
-        $slug = wp_unique_term_slug($slug, (object) $args);
-        if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
-            return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
-        $term_id = (int) $wpdb->insert_id;
+                $slug = wp_unique_term_slug($slug, (object) $args);
+                if( !is_multisite() ) {
+                        if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
+                                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                        $term_id = (int) $wpdb->insert_id;
+                } else {
+                        $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
+                        $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
+                        if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id','name', 'slug', 'term_group' ) ) )
+                                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                }
     }