Ticket #28979: 28979.4.diff

src/wp-admin/css/customize-controls.css

@@ -132 +132 @@
 }
 
 #customize-theme-controls .control-section:last-of-type.open,
-#customize-theme-controls .control-section:last-of-type .accordion-section-title {
+#customize-theme-controls .control-section:last-of-type > .accordion-section-title {
         border-bottom-color: #ddd;
 }
 

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

@@ -43 +43 @@
          */
         public $widgets;
 
-        protected $settings = array();
-        protected $panels   = array();
-        protected $sections = array();
-        protected $controls = array();
+        protected $settings   = array();
+        protected $containers = array();
+        protected $panels     = array();
+        protected $sections   = array();
+        protected $controls   = array();
 
         protected $nonce_tick;
 
@@ -305 +306 @@
         }
 
         /**
+         * Get the registered containers.
+         *
+         * @since 4.0.0
+         *
+         * @return array
+         */
+        public function containers() {
+                return $this->containers;
+        }
+
+        /**
          * Get the registered sections.
          *
          * @since 3.4.0
@@ -890 +902 @@
                         $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

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