<!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>[32855] trunk/src/wp-includes: Keep `WP_Customize_Nav_Menus_Panel` with other panels rather than controls.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32855">32855</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32855","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-19 08:36:37 +0000 (Fri, 19 Jun 2015)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Keep `WP_Customize_Nav_Menus_Panel` with other panels rather than controls.

Accidentally merged into the wrong file in <a href="https://core.trac.wordpress.org/changeset/32806">[32806]</a>.
H/t celloexpressions for noticing.

See https://wordpress.slack.com/archives/core-customize/p1434696254000258.
See <a href="https://core.trac.wordpress.org/ticket/32576">#32576</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizepanelphp">trunk/src/wp-includes/class-wp-customize-panel.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php      2015-06-19 03:48:55 UTC (rev 32854)
+++ trunk/src/wp-includes/class-wp-customize-control.php        2015-06-19 08:36:37 UTC (rev 32855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1404,101 +1404,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Customize Nav Menus Panel Class
- *
- * Needed to add screen options.
- *
- * @since 4.3.0
- */
-class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {
-
-       /**
-        * Control type.
-        *
-        * @since 4.3.0
-        *
-        * @access public
-        * @var string
-        */
-       public $type = 'nav_menus';
-
-       /**
-        * Render screen options for Menus.
-        *
-        * @since 4.3.0
-        */
-       public function render_screen_options() {
-               // Essentially adds the screen options.
-               add_filter( 'manage_nav-menus_columns', array( $this, 'wp_nav_menu_manage_columns' ) );
-
-               // Display screen options.
-               $screen = WP_Screen::get( 'nav-menus.php' );
-               $screen->render_screen_options();
-       }
-
-       /**
-        * Returns the advanced options for the nav menus page.
-        *
-        * Link title attribute added as it's a relatively advanced concept for new users.
-        *
-        * @since 4.3.0
-        *
-        * @return array The advanced menu properties.
-        */
-       function wp_nav_menu_manage_columns() {
-               return array(
-                       '_title'      => __( 'Show advanced menu properties' ),
-                       'cb'          => '<input type="checkbox" />',
-                       'link-target' => __( 'Link Target' ),
-                       'attr-title'  => __( 'Title Attribute' ),
-                       'css-classes' => __( 'CSS Classes' ),
-                       'xfn'         => __( 'Link Relationship (XFN)' ),
-                       'description' => __( 'Description' ),
-               );
-       }
-
-       /**
-        * An Underscore (JS) template for this panel's content (but not its container).
-        *
-        * Class variables for this panel class are available in the `data` JS object;
-        * export custom variables by overriding {@see WP_Customize_Panel::json()}.
-        *
-        * @since 4.3.0
-        *
-        * @see WP_Customize_Panel::print_template()
-        *
-        * @since 4.3.0
-        */
-       protected function content_template() {
-               ?>
-               <li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
-                       <button type="button" class="customize-panel-back" tabindex="-1">
-                               <span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
-                       </button>
-                       <div class="accordion-section-title">
-                               <span class="preview-notice">
-                                       <?php
-                                               /* translators: %s is the site/panel title in the Customizer */
-                                               printf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
-                                       ?>
-                               </span>
-                               <button type="button" class="customize-screen-options-toggle" aria-expanded="false">
-                                       <span class="screen-reader-text"><?php _e( 'Menu Options' ); ?></span>
-                               </button>
-                               <button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false">
-                                       <span class="screen-reader-text"><?php _e( 'Help' ); ?></span>
-                               </button>
-                       </div>
-                       <# if ( data.description ) { #>
-                       <div class="description customize-panel-description">{{{ data.description }}}</div>
-                       <# } #>
-                       <?php $this->render_screen_options(); ?>
-               </li>
-               <?php
-       }
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px">  * Customize Nav Menu Control Class
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.3.0
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizepanelphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-panel.php        2015-06-19 03:48:55 UTC (rev 32854)
+++ trunk/src/wp-includes/class-wp-customize-panel.php  2015-06-19 08:36:37 UTC (rev 32855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,3 +380,98 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <?php
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Customize Nav Menus Panel Class
+ *
+ * Needed to add screen options.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {
+
+       /**
+        * Control type.
+        *
+        * @since 4.3.0
+        *
+        * @access public
+        * @var string
+        */
+       public $type = 'nav_menus';
+
+       /**
+        * Render screen options for Menus.
+        *
+        * @since 4.3.0
+        */
+       public function render_screen_options() {
+               // Essentially adds the screen options.
+               add_filter( 'manage_nav-menus_columns', array( $this, 'wp_nav_menu_manage_columns' ) );
+
+               // Display screen options.
+               $screen = WP_Screen::get( 'nav-menus.php' );
+               $screen->render_screen_options();
+       }
+
+       /**
+        * Returns the advanced options for the nav menus page.
+        *
+        * Link title attribute added as it's a relatively advanced concept for new users.
+        *
+        * @since 4.3.0
+        *
+        * @return array The advanced menu properties.
+        */
+       function wp_nav_menu_manage_columns() {
+               return array(
+                       '_title'      => __( 'Show advanced menu properties' ),
+                       'cb'          => '<input type="checkbox" />',
+                       'link-target' => __( 'Link Target' ),
+                       'attr-title'  => __( 'Title Attribute' ),
+                       'css-classes' => __( 'CSS Classes' ),
+                       'xfn'         => __( 'Link Relationship (XFN)' ),
+                       'description' => __( 'Description' ),
+               );
+       }
+
+       /**
+        * An Underscore (JS) template for this panel's content (but not its container).
+        *
+        * Class variables for this panel class are available in the `data` JS object;
+        * export custom variables by overriding {@see WP_Customize_Panel::json()}.
+        *
+        * @since 4.3.0
+        *
+        * @see WP_Customize_Panel::print_template()
+        *
+        * @since 4.3.0
+        */
+       protected function content_template() {
+               ?>
+               <li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
+                       <button type="button" class="customize-panel-back" tabindex="-1">
+                               <span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+                       </button>
+                       <div class="accordion-section-title">
+                               <span class="preview-notice">
+                                       <?php
+                                       /* Translators: %s is the site/panel title in the Customizer. */
+                                       printf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
+                                       ?>
+                               </span>
+                               <button type="button" class="customize-screen-options-toggle" aria-expanded="false">
+                                       <span class="screen-reader-text"><?php _e( 'Menu Options' ); ?></span>
+                               </button>
+                               <button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false">
+                                       <span class="screen-reader-text"><?php _e( 'Help' ); ?></span>
+                               </button>
+                       </div>
+                       <# if ( data.description ) { #>
+                       <div class="description customize-panel-description">{{{ data.description }}}</div>
+                       <# } #>
+                       <?php $this->render_screen_options(); ?>
+               </li>
+       <?php
+       }
+}
</ins></span></pre>
</div>
</div>

</body>
</html>