From e4bfbcd9c18bc5755c43bb2bba18ba016e1868a4 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Tue, 7 Apr 2015 04:14:26 +0000
Subject: [PATCH] Avoid an unexpected object error when syncing global terms

Pass the expected single value, rather than object, when recursively calling `global_terms()`.

Props hauvong.

See #31914, Fixes #31149.

Built from https://develop.svn.wordpress.org/trunk@32064


git-svn-id: http://core.svn.wordpress.org/trunk@32043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-functions.php | 2 +-
 wp-includes/version.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index a1b67a609d..6dbcf086d8 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1801,7 +1801,7 @@ function global_terms( $term_id, $deprecated = '' ) {
 			$global_id = $wpdb->insert_id;
 		}
 	} elseif ( $global_id != $term_id ) {
-		$local_id = $wpdb->get_row( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
+		$local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
 		if ( null != $local_id ) {
 			global_terms( $local_id );
 			if ( 10 < $global_terms_recurse ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 554b41f209..be317d300f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32063';
+$wp_version = '4.2-beta4-32064';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.