Revert [28719] and no longer math-process multiplication of negative numbers
see #19308 fixes #30445 props rmccue git-svn-id: https://develop.svn.wordpress.org/trunk@30752 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
5d259386be
commit
71bb091cc3
|
@ -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 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -802,9 +802,10 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
|
|||
"-123x1=-123",
|
||||
"-123×1=-123",
|
||||
),
|
||||
// @ticket 30445
|
||||
array(
|
||||
"-123x-1",
|
||||
"-123×-1",
|
||||
"-123x-1",
|
||||
),
|
||||
array(
|
||||
"0.675x1=0.675",
|
||||
|
|
Loading…
Reference in New Issue