diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/class-wp-customize-panel.php --- 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 @@ - cannot-expand<# } #>">
- + {{ data.title }}' ); - ?> + ?> + <# if ( data.description ) { #> <# } #>