Add missing charset arg for html_entity_decode()

GoogleChromeLabs · Nov 8, 2019 · 7bcd9f2 · 7bcd9f2
1 parent 714068f
commit 7bcd9f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/test-class-wp-web-app-manifest.php b/tests/test-class-wp-web-app-manifest.php
@@ -130,12 +130,12 @@ public function test_get_theme_color() {
 	 */
 	public function test_get_manifest() {
 		$this->mock_site_icon();
-		$blogname = 'PWA & Test "First" and \'second\'';
+		$blogname = 'PWA & Test "First" and \'second\' and “third”';
 		update_option( 'blogname', $blogname );
 		$actual_manifest = $this->instance->get_manifest();
 
 		// Verify that there are now entities.
-		$this->assertEquals( 'PWA &amp; Test &quot;First&quot; and &#039;second&#039;', get_option( 'blogname' ) );
+		$this->assertEquals( 'PWA &amp; Test &quot;First&quot; and &#039;second&#039; and “third”', get_option( 'blogname' ) );
 
 		$expected_manifest = array(
 			'background_color' => WP_Web_App_Manifest::FALLBACK_THEME_COLOR,

diff --git a/wp-includes/class-wp-web-app-manifest.php b/wp-includes/class-wp-web-app-manifest.php
@@ -129,7 +129,7 @@ public function get_theme_color() {
 	 */
 	public function get_manifest() {
 		$manifest = array(
-			'name'      => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES, '' ),
+			'name'      => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES, 'utf-8' ),
 			'start_url' => home_url( '/' ),
 			'display'   => 'minimal-ui',
 			'dir'       => is_rtl() ? 'rtl' : 'ltr',
@@ -158,7 +158,7 @@ public function get_manifest() {
 			$manifest['theme_color']      = $theme_color;
 		}
 
-		$description = html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES, '' );
+		$description = html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES, 'utf-8' );
 		if ( $description ) {
 			$manifest['description'] = $description;
 		}