Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Alter the regex in wptexturize() to properly handle input like: <> "Hello world" <>.

Browse Source 
Updates unit test data.

Props miqrogroove.
Fixes #30344.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-04-01 19:09:28 +00:00
parent 66e483d3e7
commit 8ec192ce1f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/formatting.php
View File

@ -235,7 +235,7 @@ function wptexturize($text, $reset = false) {
. '(?(?=!--)' // Is this a comment? . '(?(?=!--)' // Is this a comment?
. $comment_regex // Find end of comment. . $comment_regex // Find end of comment.
. '|' . '|'
. '[^>]+>' // Find end of element. . '[^>]*>' // Find end of element.
. ')' . ')'
. '|' . '|'
. $shortcode_regex // Find shortcodes. . $shortcode_regex // Find shortcodes.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta3-31964'; $wp_version = '4.2-beta3-31965';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.