Ticket #9437: 9437.3.diff

src/wp-includes/formatting.php

@@ -580 +580 @@
         // Optionally insert line breaks.
         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>
                 $pee = str_replace( array( '<br>', '<br/>' ), '<br />', $pee );

tests/phpunit/tests/formatting/Autop.php

@@ -566 +566 @@
 
                 $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 ) ) );
+        }
 }