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

Revert [28719] and no longer math-process multiplication of negative numbers

Browse Source 
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:
Mark Jaquith 2014-12-06 21:23:12 +00:00
parent 5d259386be
commit 71bb091cc3
2 changed files with 4 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

@ -288,9 +288,9 @@ function wptexturize($text, $reset = false) {
} }
// 9x9 (times), but never 0x9999 // 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! // 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 );
} }
} }
} }

3
tests/phpunit/tests/formatting/WPTexturize.php
View File

@ -802,9 +802,10 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
"-123x1=-123", "-123x1=-123",
"-123&#215;1=-123", "-123&#215;1=-123",
), ),
// @ticket 30445
array( array(
"-123x-1", "-123x-1",
"-123&#215;-1", "-123x-1",
), ),
array( array(
"0.675x1=0.675", "0.675x1=0.675",