From d6c74f0a3287e36726c28e12d4a8073a623a6fad Mon Sep 17 00:00:00 2001 From: desrosj Date: Sat, 15 Dec 2018 11:02:18 +0000 Subject: [PATCH] Networks and Sites: Fix incorrect variable location. This fixes an issue introduced in [44166] where the `$groupby` variable was inserted too low in the `get_site_ids()` function while merging [43832] into `trunk`. The merged location did not account for a new conditional statement that existed only in `trunk`, and would have resulted in values assigned to `$groupby` being erased in certain scenarios. Props spacedmonkey. See #44416. Fixes #45582. Built from https://develop.svn.wordpress.org/trunk@44186 git-svn-id: http://core.svn.wordpress.org/trunk@44016 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-site-query.php | 5 ++--- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/wp-includes/class-wp-site-query.php b/wp-includes/class-wp-site-query.php index d963c5edb4..3d2f4f173b 100644 --- a/wp-includes/class-wp-site-query.php +++ b/wp-includes/class-wp-site-query.php @@ -570,7 +570,8 @@ class WP_Site_Query { $this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $this->date_query->get_sql() ); } - $join = ''; + $join = ''; + $groupby = ''; if ( ! empty( $this->meta_query_clauses ) ) { $join .= $this->meta_query_clauses['join']; @@ -585,8 +586,6 @@ class WP_Site_Query { $where = implode( ' AND ', $this->sql_clauses['where'] ); - $groupby = ''; - $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' ); /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 31590d5032..19d346f30b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44184'; +$wp_version = '5.1-alpha-44186'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.