Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 09:07:59 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@7244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-03-11 18:18:22 +00:00
parent a3395b364e
commit 77c0f608c8
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/feed-atom.php
View File

@ -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(); ?>

2
wp-includes/feed-rss2-comments.php
View File

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

2
wp-includes/feed-rss2.php
View File

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

17
wp-includes/feed.php
View File

@ -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);
}
?>