Changeset 7244

Timestamp:

03/11/08 18:18:22 (7 months ago)

Author:

westi

Message:

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

Files:

• trunk/wp-includes/feed-atom.php (modified) (1 diff)
• trunk/wp-includes/feed-rss2-comments.php (modified) (1 diff)
• trunk/wp-includes/feed-rss2.php (modified) (1 diff)
• trunk/wp-includes/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>
-bloginfo('atom_url'
+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>
-bloginfo('comments_rss2_url')
+self_link();
-    <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>
-bloginfo('rss2_url')
+self_link();
-    <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);
+}
+
-?>