Changeset 6819 for trunk/wp-includes/feed-atom-comments.php

Timestamp:

02/13/2008 06:29:10 PM (17 years ago)

Author:

ryan

Message:

Improve metadata for atom comment search feeds. Props ionfish. fixes #5493

File:

• trunk/wp-includes/feed-atom-comments.php (modified) (2 diffs)

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

@@ -18 +18 @@
             printf(__('Comments on: %s'), get_the_title_rss());
         elseif ( is_search() )
-            printf(__('Comments for %s searching on %s'), get_bloginfo_rss( 'name' ), attribute_escape($wp_query->query_vars['s']));
+            printf(__('Comments for %1$s searching on %2$s'), get_bloginfo_rss( 'name' ), attribute_escape(get_search_query()));
         else
             printf(__('Comments for %s'), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
@@ -28 +28 @@
 
 <?php if ( is_singular() ) { ?>
-    <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo get_comments_link() ?>" />
+    <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo get_comments_link(); ?>" />
     <link rel="self" type="application/atom+xml" href="<?php echo get_post_comments_feed_link('', 'atom'); ?>" />
     <id><?php echo get_post_comments_feed_link('', 'atom'); ?></id>
+<?php } elseif(is_search()) { ?>
+    <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo get_option('home') . '?s=' . attribute_escape(get_search_query()); ?>" />
+    <link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link('', 'atom'); ?>" />
+    <id><?php echo get_search_comments_feed_link('', 'atom'); ?></id>
 <?php } else { ?>
     <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('home'); ?>" />