From 77c0f608c8bac03c1dc9f248f4bddd27c978dc2e Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 11 Mar 2008 18:18:22 +0000
Subject: [PATCH] Better self links for feeds. Fixes #5238 props andy.

git-svn-id: http://svn.automattic.com/wordpress/trunk@7244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/feed-atom.php          |  2 +-
 wp-includes/feed-rss2-comments.php |  2 +-
 wp-includes/feed-rss2.php          |  2 +-
 wp-includes/feed.php               | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index d725742c1..94a0174d5 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -25,7 +25,7 @@ $more = 1;
 
 	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
 	<id><?php bloginfo('atom_url'); ?></id>
-	<link rel="self" type="application/atom+xml" href="<?php bloginfo('atom_url'); ?>" />
+	<link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
 	<?php do_action('atom_head'); ?>
 	<?php while (have_posts()) : the_post(); ?>
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index f33398493..f75a792c1 100644
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -23,7 +23,7 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 		else
 			printf(__('Comments for %s'), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
 	?></title>
-	<atom:link href="<?php bloginfo('comments_rss2_url') ?>" rel="self" type="application/rss+xml" />
+	<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
 	<link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
 	<description><?php bloginfo_rss("description") ?></description>
 	<pubDate><?php echo gmdate('r'); ?></pubDate>
diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index 421313062..3274583d3 100644
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -21,7 +21,7 @@ $more = 1;
 
 <channel>
 	<title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
-	<atom:link href="<?php bloginfo('rss2_url') ?>" rel="self" type="application/rss+xml" />
+	<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
 	<link><?php bloginfo_rss('url') ?></link>
 	<description><?php bloginfo_rss("description") ?></description>
 	<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></pubDate>
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 871fb11e0..4cf5e6765 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -231,4 +231,21 @@ function prep_atom_text_construct($data) {
 	}
 }
 
+/**
+ * self_link() - Generate a correct link for the atom:self elemet
+ *
+ * Echo the link for the currently displayed feed in a XSS safe way.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.5
+ *
+ */
+function self_link() {
+	echo 'http'
+		. ( $_SERVER['https'] == 'on' ? 's' : '' ) . '://'
+		. $_SERVER['HTTP_HOST']
+		. wp_specialchars(stripslashes($_SERVER['REQUEST_URI']), 1);
+}
+
 ?>