From d39c01d30e8df628db1ea5d4b3fcf3d887bbab89 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 10 Sep 2013 16:55:09 +0000
Subject: [PATCH] Consistently wrap `author` and `excerpt` nodes with `CDATA`
 in feeds.

Fixes #18056.


Built from https://develop.svn.wordpress.org/trunk@25315


git-svn-id: http://core.svn.wordpress.org/trunk@25277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/export.php | 2 +-
 wp-includes/feed-rdf.php     | 8 ++++----
 wp-includes/feed-rss2.php    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index ae08c3c17d..3b26b7162d 100644
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -370,7 +370,7 @@ function export_wp( $args = array() ) {
 		<title><?php echo apply_filters( 'the_title_rss', $post->post_title ); ?></title>
 		<link><?php the_permalink_rss() ?></link>
 		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
-		<dc:creator><?php echo get_the_author_meta( 'login' ); ?></dc:creator>
+		<dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
 		<description></description>
 		<content:encoded><?php echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) ); ?></content:encoded>
diff --git a/wp-includes/feed-rdf.php b/wp-includes/feed-rdf.php
index 3a0daf1fd6..5fce27438a 100644
--- a/wp-includes/feed-rdf.php
+++ b/wp-includes/feed-rdf.php
@@ -39,13 +39,13 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <item rdf:about="<?php the_permalink_rss() ?>">
 	<title><?php the_title_rss() ?></title>
 	<link><?php the_permalink_rss() ?></link>
-	 <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt, false); ?></dc:date>
-	<dc:creator><?php the_author() ?></dc:creator>
+	<dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt, false); ?></dc:date>
+	<dc:creator><![CDATA[<?php the_author() ?>]]></dc:creator>
 	<?php the_category_rss('rdf') ?>
 <?php if (get_option('rss_use_excerpt')) : ?>
-	<description><?php the_excerpt_rss() ?></description>
+	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 <?php else : ?>
-	<description><?php the_excerpt_rss() ?></description>
+	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 	<content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
 <?php endif; ?>
 	<?php do_action('rdf_item'); ?>
diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index a20aa1ea34..5e5e3287f4 100644
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -36,7 +36,7 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 		<link><?php the_permalink_rss() ?></link>
 		<comments><?php comments_link_feed(); ?></comments>
 		<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
-		<dc:creator><?php the_author() ?></dc:creator>
+		<dc:creator><![CDATA[<?php the_author() ?>]]></dc:creator>
 		<?php the_category_rss('rss2') ?>
 
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>