Ticket #28979: 28979.diff

src/wp-admin/customize.php

@@ -161 +161 @@
 
                         <div id="customize-theme-controls"><ul>
                                 <?php
-                                foreach ( $wp_customize->panels() as $panel ) {
-                                        $panel->maybe_render();
+                                foreach ( $wp_customize->containers() as $container ) {
+                                        $container->maybe_render();
                                 }
-                                foreach ( $wp_customize->sections() as $section ) {
-                                        $section->maybe_render();
-                                }
                                 ?>
                         </ul></div>
                 </div>

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

@@ -44 +44 @@
         public $widgets;
 
         protected $settings = array();
+        protected $containers = array();
         protected $panels   = array();
         protected $sections = array();
         protected $controls = array();
@@ -328 +329 @@
         }
 
         /**
+         * Get the registered containers.
+         *
+         * @since 4.0.0
+         * @access public
+         *
+         * @return array Sorted panels and top-level sections.
+         */
+        public function containers() {
+                return $this->containers;
+        }
+
+        /**
          * Checks if the current theme is active.
          *
          * @since 3.4.0
@@ -890 +903 @@
                         $panels[] = $panel;
                 }
                 $this->panels = $panels;
+
+                // Sort panels and top-level sections together.
+                $this->containers = array_merge( $this->panels, $this->sections );
+                uasort( $this->containers, array( $this, '_cmp_priority' ) );
         }
 
         /**

src/wp-includes/class-wp-customize-widgets.php

@@ -436 +436 @@
                 $this->manager->add_panel( 'widgets', array(
                         'title' => __( 'Widgets' ),
                         'description' => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
+                        'priority' => 140,
                 ) );
 
                 foreach ( $sidebars_widgets as $sidebar_id => $sidebar_widget_ids ) {