<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29488] trunk/src: Customizer: Mixed priority sorting for panels and top-level sections.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29488">29488</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-08-14 04:42:30 +0000 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Customizer: Mixed priority sorting for panels and top-level sections.
props celloexpressions.
fixes <a href="http://core.trac.wordpress.org/ticket/28979">#28979</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/customize-controls.css (29487 => 29488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/customize-controls.css 2014-08-14 04:39:42 UTC (rev 29487)
+++ trunk/src/wp-admin/css/customize-controls.css 2014-08-14 04:42:30 UTC (rev 29488)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #customize-theme-controls .control-section:last-of-type.open,
</span><del>-#customize-theme-controls .control-section:last-of-type .accordion-section-title {
</del><ins>+#customize-theme-controls .control-section:last-of-type > .accordion-section-title {
</ins><span class="cx"> border-bottom-color: #ddd;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/customize.php (29487 => 29488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/customize.php 2014-08-14 04:39:42 UTC (rev 29487)
+++ trunk/src/wp-admin/customize.php 2014-08-14 04:42:30 UTC (rev 29488)
</span><span class="lines">@@ -161,12 +161,9 @@
</span><span class="cx">
</span><span class="cx"> <div id="customize-theme-controls"><ul>
</span><span class="cx"> <?php
</span><del>- foreach ( $wp_customize->panels() as $panel ) {
- $panel->maybe_render();
</del><ins>+ foreach ( $wp_customize->containers() as $container ) {
+ $container->maybe_render();
</ins><span class="cx"> }
</span><del>- foreach ( $wp_customize->sections() as $section ) {
- $section->maybe_render();
- }
</del><span class="cx"> ?>
</span><span class="cx"> </ul></div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-manager.php (29487 => 29488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-manager.php 2014-08-14 04:39:42 UTC (rev 29487)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2014-08-14 04:42:30 UTC (rev 29488)
</span><span class="lines">@@ -43,10 +43,11 @@
</span><span class="cx"> */
</span><span class="cx"> public $widgets;
</span><span class="cx">
</span><del>- protected $settings = array();
- protected $panels = array();
- protected $sections = array();
- protected $controls = array();
</del><ins>+ protected $settings = array();
+ protected $containers = array();
+ protected $panels = array();
+ protected $sections = array();
+ protected $controls = array();
</ins><span class="cx">
</span><span class="cx"> protected $nonce_tick;
</span><span class="cx">
</span><span class="lines">@@ -306,6 +307,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get the registered containers.
+ *
+ * @since 4.0.0
+ *
+ * @return array
+ */
+ public function containers() {
+ return $this->containers;
+ }
+
+ /**
</ins><span class="cx"> * Get the registered sections.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="lines">@@ -891,6 +903,10 @@
</span><span class="cx"> $panels[] = $panel;
</span><span class="cx"> }
</span><span class="cx"> $this->panels = $panels;
</span><ins>+
+ // Sort panels and top-level sections together.
+ $this->containers = array_merge( $this->panels, $this->sections );
+ uasort( $this->containers, array( $this, '_cmp_priority' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-widgets.php (29487 => 29488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2014-08-14 04:39:42 UTC (rev 29487)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2014-08-14 04:42:30 UTC (rev 29488)
</span><span class="lines">@@ -434,8 +434,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->manager->add_panel( 'widgets', array(
</span><del>- 'title' => __( 'Widgets' ),
</del><ins>+ 'title' => __( 'Widgets' ),
</ins><span class="cx"> 'description' => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
</span><ins>+ 'priority' => 110,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> foreach ( $sidebars_widgets as $sidebar_id => $sidebar_widget_ids ) {
</span></span></pre>
</div>
</div>
</body>
</html>