Changeset 7244

Timestamp:

03/11/2008 06:18:22 PM (12 years ago)

Author:

westi

Message:

Better self links for feeds. Fixes #5238 props andy.

Location:

trunk/wp-includes

Files:

• feed-atom.php (modified) (1 diff)
• feed-rss2-comments.php (modified) (1 diff)
• feed-rss2.php (modified) (1 diff)
• feed.php (modified) (1 diff)

trunk/wp-includes/feed-atom.php

@@ -26 +26 @@
     <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'); ?>

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

@@ -24 +24 @@
             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>

trunk/wp-includes/feed-rss2.php

@@ -22 +22 @@
 <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>

trunk/wp-includes/feed.php

@@ -232 +232 @@
 }
 
+/**
+ * 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);
+}
+
 ?>