From 2df4a9451a0b8c08761f97948219bea8bd2344eb Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Fri, 28 May 2010 20:03:29 +0000 Subject: [PATCH] don't clobber term if sitecategories doesn't exist, fixes 13482 git-svn-id: https://develop.svn.wordpress.org/trunk@15042 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/ms-functions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 2be710c9c9..b3837f7720 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1238,6 +1238,8 @@ function global_terms( $term_id, $deprecated = '' ) { if ( null == $used_global_id ) { $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) ); $global_id = $wpdb->insert_id; + if ( empty( $global_id ) ) + return $term_id; } else { $max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" ); $max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );