Changeset 14947

Timestamp:

05/26/2010 05:01:21 PM (15 years ago)

Author:

westi

Message:

Escape the guid urls when placing them in feeds and other xml locations. See #13555.

Location:

trunk

Files:

• wp-admin/includes/export.php (modified) (1 diff)
• wp-app.php (modified) (2 diffs)
• wp-includes/feed-atom-comments.php (modified) (1 diff)
• wp-includes/feed-atom.php (modified) (1 diff)
• wp-includes/feed-rss2.php (modified) (1 diff)

trunk/wp-admin/includes/export.php

@@ -348 +348 @@
         <?php wxr_post_taxonomy() ?>
 
-        <guid isPermaLink="false"><?php the_guid(); ?></guid>
+        <guid isPermaLink="false"><?php esc_url( the_guid() ); ?></guid>
         <description></description>
         <content:encoded><?php echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) ); ?></content:encoded>

trunk/wp-app.php

@@ -1151 +1151 @@
 <entry xmlns="<?php echo $this->ATOM_NS ?>"
        xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">
-    <id><?php the_guid($GLOBALS['post']->ID); ?></id>
+    <id><?php esc_url( the_guid( $GLOBALS['post']->ID ) ); ?></id>
 <?php list($content_type, $content) = prep_atom_text_construct(get_the_title()); ?>
     <title type="<?php echo $content_type ?>"><?php echo $content ?></title>
@@ -1168 +1168 @@
 <?php if ($GLOBALS['post']->post_type == 'attachment') { ?>
     <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
-    <content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php the_guid(); ?>"/>
+    <content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php esc_url( the_guid() ); ?>"/>
 <?php } else { ?>
     <link href="<?php the_permalink_rss() ?>" />

trunk/wp-includes/feed-atom-comments.php

@@ -74 +74 @@
     // Return comment threading information (http://www.ietf.org/rfc/rfc4685.txt)
     if ( $comment->comment_parent == 0 ) : // This comment is top level ?>
-        <thr:in-reply-to ref="<?php the_guid() ?>" href="<?php the_permalink_rss() ?>" type="<?php bloginfo_rss('html_type'); ?>" />
+        <thr:in-reply-to ref="<?php esc_url( the_guid() ); ?>" href="<?php the_permalink_rss() ?>" type="<?php bloginfo_rss('html_type'); ?>" />
 <?php else : // This comment is in reply to another comment
     $parent_comment = get_comment($comment->comment_parent);

trunk/wp-includes/feed-atom.php

@@ -37 +37 @@
         <title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
         <link rel="alternate" type="text/html" href="<?php the_permalink_rss() ?>" />
-        <id><?php the_guid(); ?></id>
+        <id><?php esc_url( the_guid() ); ?></id>
         <updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
         <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>

trunk/wp-includes/feed-rss2.php

@@ -40 +40 @@
         <?php the_category_rss() ?>
 
-        <guid isPermaLink="false"><?php the_guid(); ?></guid>
+        <guid isPermaLink="false"><?php esc_url( the_guid() ); ?></guid>
 <?php if (get_option('rss_use_excerpt')) : ?>
         <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>