Ticket #2833: 2833.3.diff

src/wp-includes/formatting.php

@@ -480 +480 @@
         // Find newlines in all elements and add placeholders.
         $pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
 
+        // Find newlines in the content of protected tags, and add placeholders.
+        $pee = wp_replace_in_selected_html_content( $pee, array( 'script', 'style' ), array( "\n" => " <!-- wpnl --> " ) );
+
         // Collapse line breaks before and after <option> elements so they don't get autop'd.
         if ( strpos( $pee, '<option' ) !== false ) {
                 $pee = preg_replace( '|\s*<option|', '<option', $pee );
@@ -753 +756 @@
                                 }
                         }
                 }
+        }
+
+        if ( $changed ) {
+                $haystack = implode( $textarr );
+        }
+
+        return $haystack;
+}
+
+/**
+ * Replace characters or phrases within the content of selected HTML elements.
+ *
+ * @since 4.7.0
+ *
+ * @param string $haystack The text which has to be formatted.
+ * @param array $tags The tags to replace inside of.
+ * @param array $replace_pairs In the form array('from' => 'to', ...).
+ * @return string The formatted text.
+ */
+function wp_replace_in_selected_html_content( $haystack, $tags, $replace_pairs ) {
+        // Find all elements.
+        $textarr = wp_html_split( $haystack );
+        $changed = false;
+        $replacing = 0;
+        $tag_count = count( $tags );
+
+        // Optimize when searching for one item.
+        if ( 1 === count( $replace_pairs ) ) {
+                // Extract $needle and $replace.
+                foreach ( $replace_pairs as $needle => $replace );
+
+                for ( $i = 0, $c = count( $textarr ); $i < $c; $i += 1 ) {
+                        for ( $j = 0; $j < $tag_count; $j++ ) {
+                                if ( 0 === strpos( $textarr[ $i ], '<' . $tags[ $j ] ) ) {
+                                        $replacing++;
+                                } elseif ( $textarr[ $i ] === '</' . $tags[ $j ] . '>' ) {
+                                        $replacing--;
+                                }
+                        }
+                        if ( $replacing ) {
+                                $textarr[ $i ] = str_replace( $needle, $replace, $textarr[ $i ] );
+                                $changed = true;
+                        }
+                }
+        } else {
+                // Extract all $needles.
+                $needles = array_keys( $replace_pairs );
+
+                // Loop through delimiters (elements) only.
+                for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
+                        foreach ( $needles as $needle ) {
+                                for ( $j = 0; $j < $tag_count; $j++ ) {
+                                        if ( 0 === strpos( $textarr[ $i ], '<' . $tags[ $j ] ) ) {
+                                                $replacing++;
+                                        } elseif ( $textarr[ $i ] === '</' . $tags[ $j ] . '>' ) {
+                                                $replacing--;
+                                        }
+                                }
+                                if ( $replacing ) {
+                                        $textarr[ $i ] = str_replace( $needle, $replace, $textarr[ $i ] );
+                                        $changed = true;
+                                }
+                        }
+                }
         }
 
         if ( $changed ) {

tests/phpunit/tests/formatting/Autop.php

@@ -534 +534 @@
 
                 $this->assertEquals( $expected, trim( wpautop( $content ) ) );
         }
+
+        /**
+         * wpautop() Should not alter the contents of "<script>" elements
+         *
+         * @ticket 2833
+         */
+        public function test_skip_script_elements() {
+                $code = file_get_contents( DIR_TESTDATA . '/formatting/sizzle.js' );
+                $code = str_replace( "\r", '', $code );
+                $code = htmlentities( $code );
+
+                // Not wrapped in <p> tags
+                $str = "<p><script>$code</script></p>";
+                $this->assertEquals( $str, trim( wpautop( $str ) ) );
+
+                // Text before/after is wrapped in <p> tags
+                $str = "Look at this code\n\n<script\n type='text/javascript'>$code</script>\n\nIsn't it neat?";
+
+                // Expected text after wpautop
+                $expected = '<p>Look at this code</p>' . "\n<p><script\n type='text/javascript'>" . $code . "</script></p>\n" . '<p>Isn\'t it neat?</p>';
+                $this->assertEquals( $expected, trim( wpautop( $str ) ) );
+        }
 }