Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-10-01 00:27:38 +02:00
Code Issues Projects Releases Wiki Activity

Reorder default arguments in get_terms() for consistency with the hash notation added in [29128].

Browse Source 
See #33369.
Built from https://develop.svn.wordpress.org/trunk@35321


git-svn-id: http://core.svn.wordpress.org/trunk@35287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-10-21 08:01:25 +00:00
parent 6b5e523996
commit d1dea6e6cf
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-includes/taxonomy-functions.php
View File

@ -1069,13 +1069,34 @@ function get_terms( $taxonomies, $args = '' ) {
}
}
$defaults = array('orderby' => 'name', 'order' => 'ASC',
'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
'number' => '', 'fields' => 'all', 'name' => '', 'slug' => '', 'parent' => '', 'childless' => false,
'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '', 'description__like' => '',
'pad_counts' => false, 'offset' => '', 'search' => '', 'cache_domain' => 'core',
'update_term_meta_cache' => true, 'meta_query' => '' );
$defaults = array(
'orderby' => 'name',
'order' => 'ASC',
'hide_empty' => true,
'include' => array(),
'exclude' => array(),
'exclude_tree' => array(),
'number' => '',
'offset' => '',
'fields' => 'all',
'name' => '',
'slug' => '',
'hierarchical' => true,
'search' => '',
'name__like' => '',
'description__like' => '',
'pad_counts' => false,
'get' => '',
'child_of' => 0,
'parent' => '',
'childless' => false,
'cache_domain' => 'core',
'update_term_meta_cache' => true,
'meta_query' => ''
);
$args = wp_parse_args( $args, $defaults );
$args['number'] = absint( $args['number'] );
$args['offset'] = absint( $args['offset'] );

2
wp-includes/version.php
View File

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