Ticket #3670: 3670.3.diff

wp-includes/post-template.php

@@ -165 +165 @@
 function the_content($more_link_text = null, $stripteaser = 0) {
         $content = get_the_content($more_link_text, $stripteaser);
         $content = apply_filters('the_content', $content);
-        $content = str_replace(']]>', ']]>', $content);
+        $content = escape_cdata_close( $content );
         echo $content;
 }
 

wp-includes/comment.php

@@ -1688 +1688 @@
                 $excerpt = apply_filters('the_content', $post->post_content);
         else
                 $excerpt = apply_filters('the_excerpt', $post->post_excerpt);
-        $excerpt = str_replace(']]>', ']]>', $excerpt);
+        $excerpt = escape_cdata_close( $excerpt );
         $excerpt = wp_html_excerpt($excerpt, 252) . '...';
 
         $post_title = apply_filters('the_title', $post->post_title);

wp-includes/formatting.php

@@ -1881 +1881 @@
                 $text = strip_shortcodes( $text );
 
                 $text = apply_filters('the_content', $text);
-                $text = str_replace(']]>', ']]>', $text);
+                $text = escape_cdata_close( $text );
                 $text = strip_tags($text);
                 $excerpt_length = apply_filters('excerpt_length', 55);
                 $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
@@ -2906 +2906 @@
 
 }
 
-?>
+/**
+ * Escapes closing CDATA block by splitting the closing tag between two sections.
+ *
+ * @since 3.1.0
+ * @link http://core.trac.wordpress.org/ticket/3670
+ *
+ * @param string $str String with CDATA block to escape
+ * @return string String with CDATA block escaped
+ */
+function escape_cdata_close( $str ) {
+        return '<![CDATA[' . str_replace( ']]>', ']]]><![CDATA[]>', $str ) . ']]>';
+}
+
+?>
+ No newline at end of file

wp-includes/deprecated.php

@@ -1734 +1734 @@
                 $excerpt .= ($use_dotdotdot) ? '...' : '';
                 $content = $excerpt;
         }
-        $content = str_replace(']]>', ']]>', $content);
+        $content = escape_cdata_close( $content );
         echo $content;
 }
 

wp-includes/feed.php

@@ -145 +145 @@
                 $feed_type = get_default_feed();
 
         $content = apply_filters('the_content', get_the_content());
-        $content = str_replace(']]>', ']]>', $content);
+        $content = escape_cdata_close( $content );
         return apply_filters('the_content_feed', $content, $feed_type);
 }