Changeset 30752

Timestamp:

12/06/2014 09:23:12 PM (10 years ago)

Author:

markjaquith

Message:

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

see #19308
fixes #30445
props rmccue

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/WPTexturize.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -289 +289 @@
 
             // 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&#215;$2', $curl );
+                $curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
             }
         }

trunk/tests/phpunit/tests/formatting/WPTexturize.php

@@ -803 +803 @@
                 "-123×1=-123",
             ),
+            // @ticket 30445
             array(
                 "-123x-1",
-                "-123×-1",
+                "-123x-1",
             ),
             array(