From f62bf61b2c59bf5484888f22d0b7dff0f0df050a Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Wed, 17 Jun 2015 11:40:24 +0000 Subject: [PATCH] Bail out of 4.3 term splitting routine when no shared terms are found. Props dd32. See #30261. Built from https://develop.svn.wordpress.org/trunk@32819 git-svn-id: http://core.svn.wordpress.org/trunk@32790 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 4 ++++ wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 552a931eb3..d5b58206b0 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -1870,6 +1870,10 @@ function split_all_shared_terms() { HAVING term_tt_count > 1" ); + if ( empty( $shared_terms ) ) { + return; + } + // Rekey shared term array for faster lookups. $_shared_terms = array(); foreach ( $shared_terms as $shared_term ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 8868eda466..2994125028 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32818'; +$wp_version = '4.3-alpha-32819'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.