<!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>[29487] trunk/src/wp-includes: Separate WP_Customize_Panel from WP_Customize_Section.</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/29487">29487</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-08-14 04:39:42 +0000 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Separate WP_Customize_Panel from WP_Customize_Section.
props celloexpressions.
fixes <a href="http://core.trac.wordpress.org/ticket/29197">#29197</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizesectionphp">trunk/src/wp-includes/class-wp-customize-section.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-manager.php (29486 => 29487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-manager.php 2014-08-14 04:22:34 UTC (rev 29486)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2014-08-14 04:39:42 UTC (rev 29487)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> */
</span><span class="cx"> public function __construct() {
</span><span class="cx"> require( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
</span><ins>+ require( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
</ins><span class="cx"> require( ABSPATH . WPINC . '/class-wp-customize-section.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/class-wp-customize-control.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizepanelphp"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/class-wp-customize-panel.php (0 => 29487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-panel.php (rev 0)
+++ trunk/src/wp-includes/class-wp-customize-panel.php 2014-08-14 04:39:42 UTC (rev 29487)
</span><span class="lines">@@ -0,0 +1,201 @@
</span><ins>+<?php
+/**
+ * Customize Panel Class.
+ *
+ * A UI container for sections, managed by the WP_Customize_Manager.
+ *
+ * @package WordPress
+ * @subpackage Customize
+ * @since 4.0.0
+ */
+class WP_Customize_Panel {
+
+ /**
+ * WP_Customize_Manager instance.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var WP_Customize_Manager
+ */
+ public $manager;
+
+ /**
+ * Unique identifier.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var string
+ */
+ public $id;
+
+ /**
+ * Priority of the panel, defining the display order of panels and sections.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var integer
+ */
+ public $priority = 160;
+
+ /**
+ * Capability required for the panel.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var string
+ */
+ public $capability = 'edit_theme_options';
+
+ /**
+ * Theme feature support for the panel.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var string|array
+ */
+ public $theme_supports = '';
+
+ /**
+ * Title of the panel to show in UI.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var string
+ */
+ public $title = '';
+
+ /**
+ * Description to show in the UI.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var string
+ */
+ public $description = '';
+
+ /**
+ * Customizer sections for this panel.
+ *
+ * @since 4.0.0
+ * @access public
+ * @var array
+ */
+ public $sections;
+
+ /**
+ * Constructor.
+ *
+ * Any supplied $args override class property defaults.
+ *
+ * @since 4.0.0
+ *
+ * @param WP_Customize_Manager $manager Customizer bootstrap instance.
+ * @param string $id An specific ID for the panel.
+ * @param array $args Panel arguments.
+ */
+ public function __construct( $manager, $id, $args = array() ) {
+ $keys = array_keys( get_object_vars( $this ) );
+ foreach ( $keys as $key ) {
+ if ( isset( $args[ $key ] ) ) {
+ $this->$key = $args[ $key ];
+ }
+ }
+
+ $this->manager = $manager;
+ $this->id = $id;
+
+ $this->sections = array(); // Users cannot customize the $sections array.
+
+ return $this;
+ }
+
+ /**
+ * Checks required user capabilities and whether the theme has the
+ * feature support required by the panel.
+ *
+ * @since 4.0.0
+ *
+ * @return bool False if theme doesn't support the panel or the user doesn't have the capability.
+ */
+ public final function check_capabilities() {
+ if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+ return false;
+ }
+
+ if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Check capabilities and render the panel.
+ *
+ * @since 4.0.0
+ */
+ public final function maybe_render() {
+ if ( ! $this->check_capabilities() ) {
+ return;
+ }
+
+ /**
+ * Fires before rendering a Customizer panel.
+ *
+ * @since 4.0.0
+ *
+ * @param WP_Customize_Panel $this WP_Customize_Panel instance.
+ */
+ do_action( 'customize_render_panel', $this );
+
+ /**
+ * Fires before rendering a specific Customizer panel.
+ *
+ * The dynamic portion of the hook name, $this->id, refers to the ID
+ * of the specific Customizer panel to be rendered.
+ *
+ * @since 4.0.0
+ */
+ do_action( "customize_render_panel_{$this->id}" );
+
+ $this->render();
+ }
+
+ /**
+ * Render the panel, and the sections that have been added to it.
+ *
+ * @since 4.0.0
+ * @access protected
+ */
+ protected function render() {
+ ?>
+ <li id="accordion-panel-<?php echo esc_attr( $this->id ); ?>" class="control-section control-panel accordion-section">
+ <h3 class="accordion-section-title" tabindex="0">
+ <?php echo esc_html( $this->title ); ?>
+ <span class="screen-reader-text"><?php _e( 'Press return or enter to open this panel' ); ?></span>
+ </h3>
+ <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
+ <ul class="accordion-sub-container control-panel-content">
+ <li class="accordion-section control-section<?php if ( empty( $this->description ) ) echo ' cannot-expand'; ?>">
+ <div class="accordion-section-title" tabindex="0">
+ <span class="preview-notice"><?php
+ /* translators: %s is the site/panel title in the Customizer */
+ echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title">' . esc_html( $this->title ) . '</strong>' );
+ ?></span>
+ </div>
+ <?php if ( ! empty( $this->description ) ) : ?>
+ <div class="accordion-section-content description">
+ <?php echo $this->description; ?>
+ </div>
+ <?php endif; ?>
+ </li>
+ <?php
+ foreach ( $this->sections as $section ) {
+ $section->maybe_render();
+ }
+ ?>
+ </ul>
+ </li>
+ <?php
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizesectionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-section.php (29486 => 29487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-section.php 2014-08-14 04:22:34 UTC (rev 29486)
+++ trunk/src/wp-includes/class-wp-customize-section.php 2014-08-14 04:39:42 UTC (rev 29487)
</span><span class="lines">@@ -194,82 +194,3 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-/**
- * Customize Panel Class.
- *
- * A UI container for sections, managed by the WP_Customize_Manager.
- *
- * @package WordPress
- * @subpackage Customize
- * @since 4.0.0
- */
-class WP_Customize_Panel extends WP_Customize_Section {
-
- /**
- * Customizer sections for this panel.
- *
- * @since 4.0.0
- * @access public
- * @var array
- */
- public $sections;
-
- /**
- * Constructor.
- *
- * Any supplied $args override class property defaults.
- *
- * @since 4.0.0
- * @access public
- *
- * @param WP_Customize_Manager $manager Customizer bootstrap instance.
- * @param string $id An specific ID of the section.
- * @param array $args Optional. Section arguments. Default empty array.
- */
- public function __construct( $manager, $id, $args = array() ) {
- parent::__construct( $manager, $id, $args );
-
- $this->sections = array(); // Users cannot customize the $sections array.
-
- return $this;
- }
-
- /**
- * Render the panel, and the sections that have been added to it.
- *
- * @since 4.0.0
- * @access protected
- */
- protected function render() {
- ?>
- <li id="accordion-panel-<?php echo esc_attr( $this->id ); ?>" class="control-section control-panel accordion-section">
- <h3 class="accordion-section-title" tabindex="0">
- <?php echo esc_html( $this->title ); ?>
- <span class="screen-reader-text"><?php _e( 'Press return or enter to open panel' ); ?></span>
- </h3>
- <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
- <ul class="accordion-sub-container control-panel-content">
- <li class="accordion-section control-section<?php if ( empty( $this->description ) ) echo ' cannot-expand'; ?>">
- <div class="accordion-section-title" tabindex="0">
- <span class="preview-notice"><?php
- /* translators: %s is the site/panel title in the Customize pane */
- echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title">' . esc_html( $this->title ) . '</strong>' );
- ?></span>
- </div>
- <?php if ( ! empty( $this->description ) ) : ?>
- <div class="accordion-section-content description">
- <?php echo $this->description; ?>
- </div>
- <?php endif; ?>
- </li>
- <?php
- foreach ( $this->sections as $section ) {
- $section->maybe_render();
- }
- ?>
- </ul>
- </li>
- <?php
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>