sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert [28776] and use a correct variable instead.

Browse Source 
props miqrogroove.
fixes #28575.

git-svn-id: https://develop.svn.wordpress.org/trunk@28802 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2014-06-22 22:12:47 +00:00
parent 256de085ec
commit 1c7bfc7ed1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/formatting.php
View File

@ -214,8 +214,6 @@ function wptexturize($text, $reset = false) {
$textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY ); $textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
$do_times_check = ( 1 === preg_match( '/(?<=\d)x-?\d/', $text ) );
foreach ( $textarr as &$curl ) { foreach ( $textarr as &$curl ) {
// Only call _wptexturize_pushpop_element if $curl is a delimeter. // Only call _wptexturize_pushpop_element if $curl is a delimeter.
$first = $curl[0]; $first = $curl[0];
@ -244,7 +242,7 @@ function wptexturize($text, $reset = false) {
$curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl); $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
// 9x9 (times), but never 0x9999 // 9x9 (times), but never 0x9999
if ( $do_times_check ) { if ( 1 === preg_match( '/(?<=\d)x-?\d/', $curl ) ) {
// Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one! // 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&#215;$2', $curl ); $curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(-?\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
} }