Changeset 32822

Timestamp:

06/17/2015 07:47:58 PM (11 years ago)

Author:

ocean90

Message:

Customizer: Decode HTML entities of panel/section titles.

Titles are now passed into Underscore templates but HTML-escaped, see #30737.

fixes #32670.

Location:

trunk/src/wp-includes

Files:

• class-wp-customize-nav-menus.php (modified) (5 diffs)
• class-wp-customize-panel.php (modified) (1 diff)
• class-wp-customize-section.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -112 +112 @@
                                 $items[] = array(
                                         'id'         => "post-{$post->ID}",
-                                        'title'      => html_entity_decode( get_the_title( $post ) ),
+                                        'title'      => html_entity_decode( get_the_title( $post ), ENT_QUOTES, get_bloginfo( 'charset' ) ),
                                         'type'       => 'post_type',
                                         'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
@@ -139 +139 @@
                                 $items[] = array(
                                         'id'         => "term-{$term->term_id}",
-                                        'title'      => html_entity_decode( $term->name ),
+                                        'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
                                         'type'       => 'taxonomy',
                                         'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
@@ -223 +223 @@
                                         'object'     => $post->post_type,
                                         'object_id'  => intval( $post->ID ),
-                                        'title'      => html_entity_decode( get_the_title( $post ) ),
+                                        'title'      => html_entity_decode( get_the_title( $post ), ENT_QUOTES, get_bloginfo( 'charset' ) ),
                                 );
                         }
@@ -245 +245 @@
                                         'object'     => $term->taxonomy,
                                         'object_id'  => intval( $term->term_id ),
-                                        'title'      => html_entity_decode( $term->name ),
+                                        'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
                                 );
                         }
@@ -444 +444 @@
                         $section_id = 'nav_menu[' . $menu_id . ']';
                         $this->manager->add_section( new WP_Customize_Nav_Menu_Section( $this->manager, $section_id, array(
-                                'title'     => html_entity_decode( $menu->name ),
+                                'title'     => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
                                 'priority'  => 10,
                                 'panel'     => 'nav_menus',

trunk/src/wp-includes/class-wp-customize-panel.php

@@ -215 +215 @@
          */
         public function json() {
-                $array = wp_array_slice_assoc( (array) $this, array( 'id', 'title', 'description', 'priority', 'type' ) );
+                $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();

trunk/src/wp-includes/class-wp-customize-section.php

@@ -224 +224 @@
          */
         public function json() {
-                $array = wp_array_slice_assoc( (array) $this, array( 'id', 'title', 'description', 'priority', 'panel', 'type' ) );
+                $array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'panel', 'type' ) );
+                $array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
                 $array['content'] = $this->get_content();
                 $array['active'] = $this->active();