From 1bc98482f18d0745f7008f1c019ff2c0e793ce73 Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Sat, 20 Jun 2015 19:54:47 +0000
Subject: [PATCH] Customizer: Escape original title of menu items.

see #32576.

git-svn-id: https://develop.svn.wordpress.org/trunk@32893 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-customize-control.php | 2 +-
 src/wp-includes/class-wp-customize-setting.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/class-wp-customize-control.php b/src/wp-includes/class-wp-customize-control.php
index 86321caea5..057cc660c4 100644
--- a/src/wp-includes/class-wp-customize-control.php
+++ b/src/wp-includes/class-wp-customize-control.php
@@ -1617,7 +1617,7 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 			<div class="menu-item-actions description-thin submitbox">
 				<# if ( 'custom' != data.item_type && '' != data.original_title ) { #>
 				<p class="link-to-original">
-					<?php printf( __( 'Original: %s' ), '<a class="original-link" href="{{ data.url }}">{{{ data.original_title }}}</a>' ); ?>
+					<?php printf( __( 'Original: %s' ), '<a class="original-link" href="{{ data.url }}">{{ data.original_title }}</a>' ); ?>
 				</p>
 				<# } #>
 
diff --git a/src/wp-includes/class-wp-customize-setting.php b/src/wp-includes/class-wp-customize-setting.php
index 98a4bcf146..5dd5293d31 100644
--- a/src/wp-includes/class-wp-customize-setting.php
+++ b/src/wp-includes/class-wp-customize-setting.php
@@ -866,7 +866,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 					}
 
 					if ( ! empty( $original_title ) ) {
-						$value['original_title'] = $original_title;
+						$value['original_title'] = html_entity_decode( $original_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
 					}
 				}
 			}