From ad1ecf88c5d5f6ee0530ca37bd7f455eb43f0d50 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Wed, 3 Dec 2014 11:47:23 +0000
Subject: [PATCH] Only backtick-escape individual HTML entities in the DocBlock
 for `wp_kses_normalize_entities()`.

Props TobiasBg.
Fixes #30473.

Built from https://develop.svn.wordpress.org/trunk@30726


git-svn-id: http://core.svn.wordpress.org/trunk@30716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/kses.php    | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index bfe7a1b762..cd2727a484 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -1173,7 +1173,7 @@ function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
  * Converts and fixes HTML entities.
  *
  * This function normalizes HTML entities. It will convert `AT&T` to the correct
- * `AT&amp;T, &#00058; to &#58;, &#XYZZY; to &amp;#XYZZY;` and so on.
+ * `AT&amp;T`, `&#00058;` to `&#58;`, `&#XYZZY;` to `&amp;#XYZZY;` and so on.
  *
  * @since 1.0.0
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8e5472ce68..abccd13b6b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30725';
+$wp_version = '4.1-beta2-30726';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.