From 1036637afcae3725c64a65f8e7a334bb4a94da7d Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Sat, 9 Jul 2016 11:49:29 +0000 Subject: [PATCH] Taxonomy: Remove an unnecessary double assignment in `WP_Term_Query::get_terms()`. Props birgire. Fixes #37254. Built from https://develop.svn.wordpress.org/trunk@38020 git-svn-id: http://core.svn.wordpress.org/trunk@37961 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-term-query.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php index dd42166cfd..cfb4474d05 100644 --- a/wp-includes/class-wp-term-query.php +++ b/wp-includes/class-wp-term-query.php @@ -621,7 +621,7 @@ class WP_Term_Query { $this->sql_clauses['orderby'] = $orderby ? "ORDER BY $orderby $order" : ''; $this->sql_clauses['limits'] = $limits; - $this->request = $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}"; + $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}"; // $args can be anything. Only use the args defined in defaults to compute the key. $key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) ) ) . serialize( $taxonomies ) . $this->request ); diff --git a/wp-includes/version.php b/wp-includes/version.php index dba49b4019..b60eba89ad 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta2-38019'; +$wp_version = '4.6-beta2-38020'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.