From b8944263073f1f92f6e2cda0e05124339f94d739 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sun, 27 Dec 2015 02:14:22 +0000 Subject: [PATCH] Help Tab Order should be based on the Priority Argument [34370] made the order that tabs are returned respect the order they are added, however it broke the respect of priority. By using a ksort instead of a sort, we can restore that default behavior. This adjusts the unit tests so that both order added and priority are tested. Merges [36089] to the 4.4 branch. Props meitar, swissspidy, jorbin Fixes #35215. See #33941. Built from https://develop.svn.wordpress.org/branches/4.4@36104 git-svn-id: http://core.svn.wordpress.org/branches/4.4@36069 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-screen.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php index 398bb07386..b103c6ff2f 100644 --- a/wp-admin/includes/class-wp-screen.php +++ b/wp-admin/includes/class-wp-screen.php @@ -530,7 +530,7 @@ final class WP_Screen { } } - sort( $priorities ); + ksort( $priorities ); $sorted = array(); foreach ( $priorities as $list ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 82b18121ab..73eef61fd2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4.1-alpha-36103'; +$wp_version = '4.4.1-alpha-36104'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.