Ticket #19308: miqro-19308.2.patch

src/wp-includes/formatting.php

@@ -173 +173 @@
                         // regular expressions
                         $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 );
                         }
                 }
 

tests/phpunit/tests/formatting/WPTexturize.php

@@ -773 +773 @@
                                 "12×34",
                         ),
                         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",
+                        ),
                 );
         }