Changeset 21332

Timestamp:

07/25/2012 06:04:17 PM (14 years ago)

Author:

ryan

Message:

Use get_search_query() in feed-rss2-comments.php. Props SergeyBiryukov. fixes #21365

Location:

trunk/wp-includes

Files:

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

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

@@ -17 +17 @@
         <title type="text"><?php
                 if ( is_singular() )
-                        printf(ent2ncr(__('Comments on %s')), get_the_title_rss());
+                        printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
                 elseif ( is_search() )
-                        printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), get_search_query() );
+                        printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
                 else
-                        printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
+                        printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() );
         ?></title>
         <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>

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

@@ -20 +20 @@
         <title><?php
                 if ( is_singular() )
-                        printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
+                        printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
                 elseif ( is_search() )
-                        printf(ent2ncr(__('Comments for %s searching on %s')), get_bloginfo_rss( 'name' ), esc_attr($wp_query->query_vars['s']));
+                        printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
                 else
-                        printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
+                        printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() );
         ?></title>
         <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />