Ticket #3670: 3670.001.diff

trunk/wp-includes/feed.php

@@ -48 +48 @@
         } elseif ( 0 == $encode_html ) {
                 $content = make_url_footnote($content);
         } elseif ( 2 == $encode_html ) {
+            $content = preg_replace('|//\s*<!\[CDATA\[|', '<![CDATA[', $content);
                 $content = strip_tags($content);
         }
         if ( $cut ) {

trunk/wp-includes/formatting.php

@@ -831 +832 @@
                 $text = get_the_content('');
                 $text = apply_filters('the_content', $text);
                 $text = str_replace(']]>', ']]>', $text);
+                $text = preg_replace('|//\s*<!\[CDATA\[|', '<![CDATA[', $text);
                 $text = strip_tags($text);
                 $excerpt_length = 55;
                 $words = explode(' ', $text, $excerpt_length + 1);

trunk/wp-includes/post-template.php

@@ -77 +77 @@
 function the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
         $content = get_the_content($more_link_text, $stripteaser, $more_file);
         $content = apply_filters('the_content', $content);
-        $content = str_replace(']]>', ']]>', $content);
+        if (is_feed())
+                $content = str_replace(']]>', ']]>', $content);
         echo $content;
 }