Changeset 33524

Timestamp:

07/31/2015 01:45:01 AM (10 years ago)

Author:

azaozz

Message:

Backport r33469 and r33470 to 3.8.
See #33106.

Location:

branches/3.8

Files:

• src/wp-includes/class-wp-embed.php (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (3 diffs)
• src/wp-includes/shortcodes.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/Autop.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

branches/3.8/src/wp-includes/class-wp-embed.php

@@ -281 +281 @@
      */
     function autoembed( $content ) {
-        // Strip newlines from all elements.
-        $content = wp_replace_in_html_tags( $content, array( "\n" => " " ) );
+        // Replace line breaks from all HTML elements with placeholders.
+        $content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
 
         // Find URLs that are on their own line.
-        return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
+        $content = preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
+
+        // Put the line breaks back.
+        return str_replace( '<!-- wp-line-break -->', "\n", $content );
     }
 

branches/3.8/src/wp-includes/formatting.php

@@ -249 +249 @@
     $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
 
-    // Strip newlines from all elements.
-    $pee = wp_replace_in_html_tags( $pee, array( "\n" => " " ) );
+    // Find newlines in all elements and add placeholders.
+    $pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
 
     if ( strpos($pee, '<object') !== false ) {
@@ -282 +282 @@
         $pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
+    // Restore newlines in all elements.
+    $pee = str_replace( " <!-- wpnl --> ", "\n", $pee );
+
     return $pee;
+}
+
+/**
+ * Separate HTML elements and comments from the text.
+ *
+ * @since 4.2.4
+ *
+ * @param string $input The text which has to be formatted.
+ * @return array The formatted text.
+ */
+function wp_html_split( $input ) {
+    static $regex;
+
+    if ( ! isset( $regex ) ) {
+        $comments =
+              '!'           // Start of comment, after the <.
+            . '(?:'         // Unroll the loop: Consume everything until --> is found.
+            .     '-(?!->)' // Dash not followed by end of comment.
+            .     '[^\-]*+' // Consume non-dashes.
+            . ')*+'         // Loop possessively.
+            . '(?:-->)?';   // End of comment. If not found, match all input.
+
+        $cdata =
+              '!\[CDATA\['  // Start of comment, after the <.
+            . '[^\]]*+'     // Consume non-].
+            . '(?:'         // Unroll the loop: Consume everything until ]]> is found.
+            .     '](?!]>)' // One ] not followed by end of comment.
+            .     '[^\]]*+' // Consume non-].
+            . ')*+'         // Loop possessively.
+            . '(?:]]>)?';   // End of comment. If not found, match all input.
+
+        $regex =
+              '/('              // Capture the entire match.
+            .     '<'           // Find start of element.
+            .     '(?(?=!--)'   // Is this a comment?
+            .         $comments // Find end of comment.
+            .     '|'
+            .         '(?(?=!\[CDATA\[)' // Is this a comment?
+            .             $cdata // Find end of comment.
+            .         '|'
+            .             '[^>]*>?' // Find end of element. If not found, match all input.
+            .         ')'
+            .     ')'
+            . ')/s';
+    }
+
+    return preg_split( $regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE );
 }
 
@@ -296 +346 @@
 function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
     // Find all elements.
-    $comments =
-          '!'           // Start of comment, after the <.
-        . '(?:'         // Unroll the loop: Consume everything until --> is found.
-        .     '-(?!->)' // Dash not followed by end of comment.
-        .     '[^\-]*+' // Consume non-dashes.
-        . ')*+'         // Loop possessively.
-        . '(?:-->)?';   // End of comment. If not found, match all input.
-
-    $regex =
-          '/('              // Capture the entire match.
-        .     '<'           // Find start of element.
-        .     '(?(?=!--)'   // Is this a comment?
-        .         $comments // Find end of comment.
-        .     '|'
-        .         '[^>]*>?' // Find end of element. If not found, match all input.
-        .     ')'
-        . ')/s';
-
-    $textarr = preg_split( $regex, $haystack, -1, PREG_SPLIT_DELIM_CAPTURE );
+    $textarr = wp_html_split( $haystack );
     $changed = false;
 

branches/3.8/src/wp-includes/shortcodes.php

@@ -320 +320 @@
     
     $pattern = get_shortcode_regex();
-
-    $comment_regex =
-          '!'           // Start of comment, after the <.
-        . '(?:'         // Unroll the loop: Consume everything until --> is found.
-        .     '-(?!->)' // Dash not followed by end of comment.
-        .     '[^\-]*+' // Consume non-dashes.
-        . ')*+'         // Loop possessively.
-        . '(?:-->)?';   // End of comment. If not found, match all input.
-
-    $regex =
-          '/('                   // Capture the entire match.
-        .     '<'                // Find start of element.
-        .     '(?(?=!--)'        // Is this a comment?
-        .         $comment_regex // Find end of comment.
-        .     '|'
-        .         '[^>]*>?'      // Find end of element. If not found, match all input.
-        .     ')'
-        . ')/s';
-
-    $textarr = preg_split( $regex, $content, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+    $textarr = wp_html_split( $content );
 
     foreach ( $textarr as &$element ) {
-        if ( '<' !== $element[0] ) {
+        if ( '' == $element || '<' !== $element[0] ) {
             continue;
         }
@@ -357 +338 @@
         }
 
-        if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) ) {
+        if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
             // Encode all [ and ] chars.
             $element = strtr( $element, $trans );

branches/3.8/tests/phpunit/tests/formatting/Autop.php

@@ -99 +99 @@
         $this->assertEquals( "<p>$str</p>", trim( wpautop( $str ) ) );
     }
+
+    /**
+     * Do not allow newlines within HTML elements to become mangled.
+     *
+     * @ticket 33106
+     * @dataProvider data_element_sanity
+     */
+    function test_element_sanity( $input, $output ) {
+        return $this->assertEquals( $output, wpautop( $input ) );
+    }
+
+    function data_element_sanity() {
+        return array(
+            array(
+                "Hello <a\nhref='world'>",
+                "<p>Hello <a\nhref='world'></p>\n",
+            ),
+            array(
+                "Hello <!-- a\nhref='world' -->",
+                "<p>Hello <!-- a\nhref='world' --></p>\n",
+            ),
+/* Block elements inside comments will fail this test in all versions, it's not a regression.
+            array(
+                "Hello <!-- <hr> a\nhref='world' -->",
+                "<p>Hello <!-- <hr> a\nhref='world' --></p>\n",
+            ),
+            array(
+                "Hello <![CDATA[ <hr> a\nhttps://youtu.be/jgz0uSaOZbE\n ]]>",
+                "<p>Hello <![CDATA[ <hr> a\nhttps://youtu.be/jgz0uSaOZbE\n ]]></p>\n",
+            ),
+*/
+            array(
+                "Hello <![CDATA[ a\nhttps://youtu.be/jgz0uSaOZbE\n ]]>",
+                "<p>Hello <![CDATA[ a\nhttps://youtu.be/jgz0uSaOZbE\n ]]></p>\n",
+            ),
+            array(
+                "Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 ]]> -->",
+                "<p>Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 ]]> --></p>\n",
+            ),
+            array(
+                "Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 --> a\n9 ]]>",
+                "<p>Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 --> a\n9 ]]></p>\n",
+            ),
+        );
+    }
+
 }

branches/3.8/tests/phpunit/tests/media.php

@@ -347 +347 @@
         $this->assertEquals( $contents, $matches );
     }
+    
+    /**
+     * @ticket 33016
+     */
+    function test_multiline_cdata() {
+        global $wp_embed;
+
+        $content = <<<EOF
+<script>// <![CDATA[
+_my_function('data');
+// ]]>
+</script>
+EOF;
+
+        $result = $wp_embed->autoembed( $content );
+        $this->assertEquals( $content, $result );
+    }
+
+    /**
+     * @ticket 33016
+     */
+    function test_multiline_comment() {
+        global $wp_embed;
+
+        $content = <<<EOF
+<script><!--
+my_function();
+// --> </script>
+EOF;
+
+        $result = $wp_embed->autoembed( $content );
+        $this->assertEquals( $content, $result );
+    }
+
+
+    /**
+     * @ticket 33016
+     */
+    function test_multiline_comment_with_embeds() {
+        $content = <<<EOF
+Start.
+[embed]http://www.youtube.com/embed/TEST01YRHA0[/embed]
+<script><!--
+my_function();
+// --> </script>
+http://www.youtube.com/embed/TEST02YRHA0
+[embed]http://www.example.com/embed/TEST03YRHA0[/embed]
+http://www.example.com/embed/TEST04YRHA0
+Stop.
+EOF;
+
+        $expected = <<<EOF
+<p>Start.<br />
+<a href="http://www.youtube.com/embed/TEST01YRHA0">http://www.youtube.com/embed/TEST01YRHA0</a><br />
+<script><!--
+my_function();
+// --> </script></p>
+<p>http://www.youtube.com/embed/TEST02YRHA0</p>
+<p><a href="http://www.example.com/embed/TEST03YRHA0">http://www.example.com/embed/TEST03YRHA0</a></p>
+<p>http://www.example.com/embed/TEST04YRHA0</p>
+<p>Stop.</p>
+
+EOF;
+
+        $result = apply_filters( 'the_content', $content );
+        $this->assertEquals( $expected, $result );
+    }
+
+    /**
+     * @ticket 33016
+     */
+    function filter_wp_embed_shortcode_custom( $content, $url ) {
+        if ( 'https://www.example.com/?video=1' == $url ) {
+            $content = '@embed URL was replaced@';
+        }
+        return $content;
+    }
+
+    /**
+     * @ticket 33016
+     */
+    function test_oembed_explicit_media_link() {
+        global $wp_embed;
+        add_filter( 'embed_maybe_make_link', array( $this, 'filter_wp_embed_shortcode_custom' ), 10, 2 );
+
+        $content = <<<EOF
+https://www.example.com/?video=1
+EOF;
+
+        $expected = <<<EOF
+
+@embed URL was replaced@
+
+EOF;
+
+        $result = $wp_embed->autoembed( $content );
+        $this->assertEquals( $expected, $result );
+
+        $content = <<<EOF
+<a href="https://www.example.com/?video=1">https://www.example.com/?video=1</a>
+<script>// <![CDATA[
+_my_function('data');
+myvar = 'Hello world
+https://www.example.com/?video=1
+do not break this';
+// ]]>
+</script>
+EOF;
+
+        $result = $wp_embed->autoembed( $content );
+        $this->assertEquals( $content, $result );
+
+        remove_filter( 'embed_maybe_make_link', array( $this, 'filter_wp_embed_shortcode_custom' ), 10 );
+    }
+
 }