From 8bd85a870b8f4c43eca9d6750318c9ff3b48fdc2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 1 Feb 2021 11:55:00 +0000
Subject: [PATCH] Taxonomy: Reorder some `WP_Taxonomy` properties for
 consistency.

Follow-up to [48356], [50116].

See #52142.
Built from https://develop.svn.wordpress.org/trunk@50119


git-svn-id: http://core.svn.wordpress.org/trunk@49798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-taxonomy.php | 20 ++++++++++----------
 wp-includes/version.php           |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wp-includes/class-wp-taxonomy.php b/wp-includes/class-wp-taxonomy.php
index 3c45eb1e8d..9db7403809 100644
--- a/wp-includes/class-wp-taxonomy.php
+++ b/wp-includes/class-wp-taxonomy.php
@@ -209,15 +209,6 @@ final class WP_Taxonomy {
 	 */
 	public $rest_controller_class;
 
-	/**
-	 * The default term name for this taxonomy. If you pass an array you have
-	 * to set 'name' and optionally 'slug' and 'description'.
-	 *
-	 * @since 5.5.0
-	 * @var array|string
-	 */
-	public $default_term;
-
 	/**
 	 * The controller instance for this taxonomy's REST API endpoints.
 	 *
@@ -228,6 +219,15 @@ final class WP_Taxonomy {
 	 */
 	public $rest_controller;
 
+	/**
+	 * The default term name for this taxonomy. If you pass an array you have
+	 * to set 'name' and optionally 'slug' and 'description'.
+	 *
+	 * @since 5.5.0
+	 * @var array|string
+	 */
+	public $default_term;
+
 	/**
 	 * Whether terms in this taxonomy should be sorted in the order they are provided to `wp_set_object_terms()`.
 	 *
@@ -321,9 +321,9 @@ final class WP_Taxonomy {
 			'rest_base'             => false,
 			'rest_controller_class' => false,
 			'default_term'          => null,
-			'_builtin'              => false,
 			'sort'                  => null,
 			'args'                  => null,
+			'_builtin'              => false,
 		);
 
 		$args = array_merge( $defaults, $args );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5d28e32edb..b8d1069069 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-50118';
+$wp_version = '5.7-alpha-50119';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.