From ae47e05f7470c65adc536a3b6a7d5fb1afda1d0f Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Mon, 14 Aug 2017 05:59:42 +0000 Subject: [PATCH] Widgets: Suppress PHP warnings raised by `DOMDocument::loadHTML()` in `WP_Widget_Text::is_legacy_instance()` which could appear in Text widget forms. Also explicitly use HTML5 doctype when parsing Text widget contents in legacy mode detection. Amends [41050]. See #40951. Fixes #41622. Built from https://develop.svn.wordpress.org/trunk@41251 git-svn-id: http://core.svn.wordpress.org/trunk@41091 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-includes/widgets/class-wp-widget-text.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 9d6bfb5f07..7367c0aaa8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-alpha-41250'; +$wp_version = '4.9-alpha-41251'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets/class-wp-widget-text.php b/wp-includes/widgets/class-wp-widget-text.php index e6d979347d..ef9e349aa4 100644 --- a/wp-includes/widgets/class-wp-widget-text.php +++ b/wp-includes/widgets/class-wp-widget-text.php @@ -116,8 +116,8 @@ class WP_Widget_Text extends WP_Widget { } $doc = new DOMDocument(); - $doc->loadHTML( sprintf( - '%s', + @$doc->loadHTML( sprintf( + '%s', esc_attr( get_bloginfo( 'charset' ) ), $instance['text'] ) );