diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 75ca351c20..0cd9e5c6a6 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -131,7 +131,6 @@ add_filter( 'the_title', 'trim' ); add_filter( 'the_content', 'wptexturize' ); add_filter( 'the_content', 'convert_smilies' ); -add_filter( 'the_content', 'convert_chars' ); add_filter( 'the_content', 'wpautop' ); add_filter( 'the_content', 'shortcode_unautop' ); add_filter( 'the_content', 'prepend_attachment' ); diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index be20e8b036..5261acb75e 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -276,12 +276,13 @@ function wptexturize( $text, $reset = false ) { // Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one! $curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1×$2', $curl ); } + + // Replace each & with & unless it already looks like an entity. + $curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&', $curl ); } } - $text = implode( '', $textarr ); - // Replace each & with & unless it already looks like an entity. - return preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&', $text ); + return implode( '', $textarr ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 8731c4fe08..24d5725a4c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta4-35708'; +$wp_version = '4.4-beta4-35709'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.