Changeset 28719

Timestamp:

06/10/2014 02:17:24 AM (10 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)
+            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)\b/', '$1&#215;$2', $curl );
             }
         }

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

@@ -782 +782 @@
             ),
             array(
+
+
+
+
+
+
+
+
+
+
+
+
                 "9 x 9",
                 "9 x 9",
             ),
+
+
+
+
+
+
+
+
         );
     }