Changeset 28719

Timestamp:

06/10/2014 02:17:24 AM (12 years ago)

Author:

wonderboymusic

Message:

In wptexturize(), don't convert C-style hexadecimals to mathematical ×.

Adds unit tests.

Props harrym, kurtpayne, miqrogroove.
Fixes #19308.

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

@@ -181 +181 @@
                         $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
 
-                        // 9x9 (times)
-                        if ( 1 === preg_match( '/(?<=\d)x\d/', $text ) ) {
+                        // 9x9 (times), but never 0x9999
+                        if ( 1 === preg_match( '/(?<=\d)x-?\d/', $text ) ) {
                                 // Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
-                                $curl = preg_replace( '/\b(\d+)x(\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

@@ -782 +782 @@
                         ),
                         array(
+                                "-123x1=-123",
+                                "-123×1=-123",
+                        ),
+                        array(
+                                "-123x-1",
+                                "-123×-1",
+                        ),
+                        array(
+                                "0.675x1=0.675",
+                                "0.675×1=0.675",
+                        ),
+                        array(
                                 "9 x 9",
                                 "9 x 9",
                         ),
+                        array(
+                                "0x70",
+                                "0x70",
+                        ),
+                        array(
+                                "3x2x1x0",
+                                "3x2x1x0",
+                        ),
                 );
         }