diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php
index 919a347bcc..e7c3c7cba6 100644
--- a/wp-includes/feed-atom-comments.php
+++ b/wp-includes/feed-atom-comments.php
@@ -17,7 +17,7 @@ echo ''
if ( is_singular() )
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());
?>
@@ -27,9 +27,13 @@ echo ''
-
+
+
+
+
+