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

Timestamp:

11/03/2014 09:34:44 PM (10 years ago)

Author:

ocean90

Message:

Customizer: Add stable sorting for panels, sections and controls in JS. Improve sorting in PHP.

props westonruter.
fixes #30225.

File:

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

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

@@ -857 +857 @@
      */
     public function render_control_templates() {
-        foreach( $this->registered_control_types as $control_type ) {
+        foreach ( $this->registered_control_types as $control_type ) {
             $control = new $control_type( $this, 'temp', array() );
             $control->print_template();
@@ -863 +863 @@
     }
 
-    /** 
-     * Helper function to compare two objects by priority.
-     *
-     * @since 3.4.0
-     *
-     * @param object $a Object A.
-     * @param object $b Object B.
+    /**
+     * Helper function to compare two objects by priority, ensuring sort stability via instance_number.
+     *
+     * @since 3.4.0
+     *
+     * @param {WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control} $a Object A.
+     * @param {WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control} $b Object B.
      * @return int
      */
     protected final function _cmp_priority( $a, $b ) {
-        $ap = $a->priority;
-        $bp = $b->priority;
-
-        if ( $ap == $bp )
-            return 0;
-        return ( $ap > $bp ) ? 1 : -1;
+        if ( $a->priority === $b->priority ) {
+            return $a->instance_number - $a->instance_number;
+        } else {
+            return $a->priority - $b->priority;
+        }
     }
 
@@ -892 +891 @@
     public function prepare_controls() {
 
-        $this->controls = array_reverse( $this->controls );
         $controls = array();
+        uasort( $this->controls, array( $this, '_cmp_priority' ) );
 
         foreach ( $this->controls as $id => $control ) {
@@ -906 +905 @@
 
         // Prepare sections.
-        // Reversing makes uasort sort by time added when conflicts occur.
-        $this->sections = array_reverse( $this->sections );
         uasort( $this->sections, array( $this, '_cmp_priority' ) );
         $sections = array();
@@ -931 +928 @@
 
         // Prepare panels.
-        // Reversing makes uasort sort by time added when conflicts occur.
-        $this->panels = array_reverse( $this->panels );
         uasort( $this->panels, array( $this, '_cmp_priority' ) );
         $panels = array();