Revert [28719] and no longer math-process multiplication of negative numbers
see #19308 fixes #30445 props rmccue Built from https://develop.svn.wordpress.org/trunk@30752 git-svn-id: http://core.svn.wordpress.org/trunk@30742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
bc35a81482
commit
14b0899e57
|
@ -288,9 +288,9 @@ function wptexturize($text, $reset = false) {
|
|||
}
|
||||
|
||||
// 9x9 (times), but never 0x9999
|
||||
if ( 1 === preg_match( '/(?<=\d)x-?\d/', $curl ) ) {
|
||||
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!
|
||||
$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(-?\d[\d\.,]*)\b/', '$1×$2', $curl );
|
||||
$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1×$2', $curl );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.1-beta2-30751';
|
||||
$wp_version = '4.1-beta2-30752';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue