Changeset 38928 for trunk/src/wp-includes/class-wp-customize-manager.php

Timestamp:

10/25/2016 09:25:25 PM (10 years ago)

Author:

ocean90

Message:

General: Introduce a wp_list_sort() helper function, v2.

In addition to wp_list_filter() for filtering a list of objects, and wp_list_pluck() for plucking a certain field out of each object in a list, this new function can be used for sorting a list of objects by specific fields. These functions are now all contained within the new WP_List_Util() class and wp_list_sort() is used in various parts of core for sorting lists.

This was previously committed in [38859] but got reverted in [38862] and [38863]. To fix the previous issues, wp_list_sort() supports now an additional argument to preserve array keys via uasort().

Props flixos90, DrewAPicture, jorbin.
Fixes #37128.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (8 diffs)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -2506 +2506 @@
          *
          * @since 3.4.0
+         * @deprecated 4.7.0 Use wp_list_sort()
          *
          * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $a Object A.
@@ -2512 +2513 @@
          */
         protected function _cmp_priority( $a, $b ) {
+                _deprecated_function( __METHOD__, '4.7.0', 'wp_list_sort' );
+
                 if ( $a->priority === $b->priority ) {
                         return $a->instance_number - $b->instance_number;
@@ -2531 +2534 @@
 
                 $controls = array();
-                uasort( $this->controls, array( $this, '_cmp_priority' ) );
+                $this->controls = wp_list_sort( $this->controls, array(
+                        'priority'        => 'ASC',
+                        'instance_number' => 'ASC',
+                ), 'ASC', true );
 
                 foreach ( $this->controls as $id => $control ) {
@@ -2544 +2550 @@
 
                 // Prepare sections.
-                uasort( $this->sections, array( $this, '_cmp_priority' ) );
+                $this->sections = wp_list_sort( $this->sections, array(
+                        'priority'        => 'ASC',
+                        'instance_number' => 'ASC',
+                ), 'ASC', true );
                 $sections = array();
 
@@ -2552 +2561 @@
                         }
 
-                        usort( $section->controls, array( $this, '_cmp_priority' ) );
+
+                        $section->controls = wp_list_sort( $section->controls, array(
+                                'priority'        => 'ASC',
+                                'instance_number' => 'ASC',
+                        ) );
 
                         if ( ! $section->panel ) {
@@ -2567 +2580 @@
 
                 // Prepare panels.
-                uasort( $this->panels, array( $this, '_cmp_priority' ) );
+                $this->panels = wp_list_sort( $this->panels, array(
+                        'priority'        => 'ASC',
+                        'instance_number' => 'ASC',
+                ), 'ASC', true );
                 $panels = array();
 
@@ -2575 +2591 @@
                         }
 
-                        uasort( $panel->sections, array( $this, '_cmp_priority' ) );
+                        $panel->sections = wp_list_sort( $panel->sections, array(
+                                'priority'        => 'ASC',
+                                'instance_number' => 'ASC',
+                        ), 'ASC', true );
                         $panels[ $panel->id ] = $panel;
                 }
@@ -2582 +2601 @@
                 // Sort panels and top-level sections together.
                 $this->containers = array_merge( $this->panels, $this->sections );
-                uasort( $this->containers, array( $this, '_cmp_priority' ) );
+                $this->containers = wp_list_sort( $this->containers, array(
+                        'priority'        => 'ASC',
+                        'instance_number' => 'ASC',
+                ), 'ASC', true );
         }