Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-21 03:51:26 +02:00
Code Issues Projects Releases Wiki Activity

In WP_Term_Query, accept a string value for taxonomy.

Browse Source 
Merges [38181] to the 4.6 branch.

Props endocreative.
Props ocean90 for review.
Fixes #37545.

Built from https://develop.svn.wordpress.org/branches/4.6@38182


git-svn-id: http://core.svn.wordpress.org/branches/4.6@38123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2016-08-03 13:54:30 +00:00
parent beded541a7
commit 15bf460317
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-term-query.php
View File

@ -219,7 +219,7 @@ class WP_Term_Query {
$query = $this->query_vars;
}
$taxonomies = isset( $query['taxonomy'] ) ? $query['taxonomy'] : null;
$taxonomies = isset( $query['taxonomy'] ) ? (array) $query['taxonomy'] : null;
/**
* Filters the terms query default arguments.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-RC1-38180';
$wp_version = '4.6-RC1-38182';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.