Changeset 38862

Timestamp:

10/21/2016 04:16:17 PM (7 years ago)

Author:

westonruter

Message:

Customize: Revert part of [38859] which caused sections to get deactivated in the customizer.

See #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.
@@ -2513 +2512 @@
      */
     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;
@@ -2534 +2531 @@
 
         $controls = array();
-        $this->controls = wp_list_sort( $this->controls, array(
-            'priority'        => 'ASC',
-            'instance_number' => 'ASC',
-        ) );
+        uasort( $this->controls, array( $this, '_cmp_priority' ) );
 
         foreach ( $this->controls as $id => $control ) {
@@ -2550 +2544 @@
 
         // Prepare sections.
-        $this->sections = wp_list_sort( $this->sections, array(
-            'priority'        => 'ASC',
-            'instance_number' => 'ASC',
-        ) );
+        uasort( $this->sections, array( $this, '_cmp_priority' ) );
         $sections = array();
 
@@ -2561 +2552 @@
             }
 
-
-            $section->controls = wp_list_sort( $section->controls, array(
-                'priority'        => 'ASC',
-                'instance_number' => 'ASC',
-            ) );
+            usort( $section->controls, array( $this, '_cmp_priority' ) );
 
             if ( ! $section->panel ) {
@@ -2580 +2567 @@
 
         // Prepare panels.
-        $this->panels = wp_list_sort( $this->panels, array(
-            'priority'        => 'ASC',
-            'instance_number' => 'ASC',
-        ) );
+        uasort( $this->panels, array( $this, '_cmp_priority' ) );
         $panels = array();
 
@@ -2591 +2575 @@
             }
 
-            $panel->sections = wp_list_sort( $panel->sections, array(
-                'priority'        => 'ASC',
-                'instance_number' => 'ASC',
-            ) );
+            uasort( $panel->sections, array( $this, '_cmp_priority' ) );
             $panels[ $panel->id ] = $panel;
         }
@@ -2601 +2582 @@
         // Sort panels and top-level sections together.
         $this->containers = array_merge( $this->panels, $this->sections );
-        $this->containers = wp_list_sort( $this->containers, array(
-            'priority'        => 'ASC',
-            'instance_number' => 'ASC',
-        ) );
+        uasort( $this->containers, array( $this, '_cmp_priority' ) );
     }