--- a/wp/wp-includes/class-wp-customize-panel.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/class-wp-customize-panel.php Mon Oct 14 18:28:13 2019 +0200
@@ -24,8 +24,6 @@
* Used when sorting two instances whose priorities are equal.
*
* @since 4.1.0
- *
- * @static
* @var int
*/
protected static $instance_count = 0;
@@ -152,7 +150,7 @@
}
$this->manager = $manager;
- $this->id = $id;
+ $this->id = $id;
if ( empty( $this->active_callback ) ) {
$this->active_callback = array( $this, 'active_callback' );
}
@@ -170,7 +168,7 @@
* @return bool Whether the panel is active to the current preview.
*/
final public function active() {
- $panel = $this;
+ $panel = $this;
$active = call_user_func( $this->active_callback, $this );
/**
@@ -208,11 +206,11 @@
* @return array The array to be exported to the client as JSON.
*/
public function json() {
- $array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'type' ) );
- $array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
- $array['content'] = $this->get_content();
- $array['active'] = $this->active();
- $array['instanceNumber'] = $this->instance_number;
+ $array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'type' ) );
+ $array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+ $array['content'] = $this->get_content();
+ $array['active'] = $this->active();
+ $array['instanceNumber'] = $this->instance_number;
$array['autoExpandSoleSection'] = $this->auto_expand_sole_section;
return $array;
}
@@ -318,7 +316,7 @@
<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr( $this->type ); ?>">
<?php $this->render_template(); ?>
</script>
- <?php
+ <?php
}
/**
@@ -358,10 +356,12 @@
<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
<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
+ <span class="preview-notice">
+ <?php
/* translators: %s: the site/panel title in the Customizer */
echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
- ?></span>
+ ?>
+ </span>
<# if ( data.description ) { #>
<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
<# } #>