WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow 'slug' param of `get_terms()` to accept an array. 

Props jfarthing84, dlh.
Fixes #23636.
Built from https://develop.svn.wordpress.org/trunk@30042


git-svn-id: http://core.svn.wordpress.org/trunk@30042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2014-10-28 14:57:22 +00:00
parent 64d1fd2a8f
commit 4177b48b1e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/taxonomy.php
View File

@ -1594,7 +1594,7 @@ function get_term_to_edit( $id, $taxonomy ) {
* @type string $fields Term fields to query for. Accepts 'all' (returns an array of
* term objects), 'ids' or 'names' (returns an array of integers
* or strings, respectively. Default 'all'.
* @type string $slug Slug to return term(s) for. Default empty.
* @type string|array $slug Optional. Slug(s) to return term(s) for. Default empty.
* @type bool $hierarchical Whether to include terms that have non-empty descendants (even
* if $hide_empty is set to true). Default true.
* @type string $search Search criteria to match terms. Will be SQL-formatted with
@ -1804,9 +1804,14 @@ function get_terms( $taxonomies, $args = '' ) {
}
if ( ! empty( $args['slug'] ) ) {
if ( is_array( $args['slug'] ) ) {
$slug = array_map( 'sanitize_title', $args['slug'] );
$where .= " AND t.slug IN ('" . implode( "', '", $slug ) . "')";
} else {
$slug = sanitize_title( $args['slug'] );
$where .= " AND t.slug = '$slug'";
}
}
if ( ! empty( $args['name__like'] ) ) {
$where .= $wpdb->prepare( " AND t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-alpha-30041';
$wp_version = '4.1-alpha-30042';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.