Changeset 45577

Timestamp:

07/01/2019 03:18:28 AM (6 years ago)

Author:

pento

Message:

Formatting: Don't add <p> tags inside <svg> tags.

Inline <svg>s should generally work, as browsers should just ignore <p> or <br/> tags that shouldn't be inside the <svg>. To keep things neat, however, it's better not add them in the first place.

Props jared_smith, nacin, pento.
Fixes #9437.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -581 +581 @@
     if ( $br ) {
         // Replace newlines that shouldn't be touched with a placeholder.
-        $pee = preg_replace_callback( '/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee );
+        $pee = preg_replace_callback( '/<(script|style|svg).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee );
 
         // Normalize <br>

trunk/tests/phpunit/tests/formatting/Autop.php

@@ -567 +567 @@
         $this->assertEquals( $expected, trim( wpautop( $content ) ) );
     }
+
+    /**
+     * wpautop() should ignore inline SVG graphics
+     *
+     * @ticket 9437
+     */
+    function test_that_wpautop_ignores_inline_svgs() {
+        $content =
+            '<svg xmlns="http://www.w3.org/2000/svg">
+                <circle cx="50" cy="50" r="30" fill="blue">
+                    <animateTransform attributeName="transform" type="scale" to="1.5" dur="2s" fill="freeze"/>
+                </circle>
+            </svg>';
+
+        $expected = '<p>' . $content . '</p>';
+
+        $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+    }
+
+    /**
+     * wpautop() should ignore inline scripts
+     *
+     * @ticket 9437
+     */
+    function test_that_wpautop_ignores_inline_scripts() {
+        $content =
+            '<script type="text/javascript">
+                var dummy = 1;
+            </script>';
+
+        $expected = '<p>' . $content . '</p>';
+
+        $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+    }
 }