From d1dea6e6cfe09c7986cbeff14a99e3531b9df85d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 21 Oct 2015 08:01:25 +0000
Subject: [PATCH] Reorder default arguments in `get_terms()` for consistency
 with the hash notation added in [29128].

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
---
 wp-includes/taxonomy-functions.php | 33 ++++++++++++++++++++++++------
 wp-includes/version.php            |  2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/wp-includes/taxonomy-functions.php b/wp-includes/taxonomy-functions.php
index 77b6b8606e..d9b6dcd743 100644
--- a/wp-includes/taxonomy-functions.php
+++ b/wp-includes/taxonomy-functions.php
@@ -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'] );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 867cf60d85..a837cd7321 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -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.