Changeset 6224

Timestamp:

01/12/2017 11:14:24 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Feeds: Avoid duplicate site name in replies feed title.

Fixes #2998. Props SergeyBiryukov.

Location:

trunk/src/includes

Files:

• replies/functions.php (modified) (3 diffs)
• topics/functions.php (modified) (1 diff)

trunk/src/includes/replies/functions.php

@@ -2270 +2270 @@
  * @uses get_wp_title_rss()
  * @uses get_option()
- * @uses bloginfo_rss
+ * @uses bloginfo_rss()
  * @uses self_link()
  * @uses the_author()
@@ -2289 +2289 @@
     // Adjust the title based on context
     if ( bbp_is_single_topic() && bbp_user_can_view_forum( array( 'forum_id' => bbp_get_topic_forum_id() ) ) ) {
-        $title = apply_filters( 'wp_title_rss', get_wp_title_rss( ' » ' ) );
+        $title = apply_filters( 'wp_title_rss', get_wp_title_rss() );
     } elseif ( ! bbp_show_lead_topic() ) {
-        $title = ' » ' .  __( 'All Posts',   'bbpress' );
+        $title = get_bloginfo_rss( 'name' ) . ' » ' .  __( 'All Posts',   'bbpress' );
     } else {
-        $title = ' » ' .  __( 'All Replies', 'bbpress' );
+        $title = get_bloginfo_rss( 'name' ) . ' » ' .  __( 'All Replies', 'bbpress' );
     }
 
@@ -2311 +2311 @@
 
     <channel>
-        <title><?php bloginfo_rss('name'); echo $title; ?></title>
+        <title><?php echo $title; ?></title>
         <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
         <link><?php self_link(); ?></link>

trunk/src/includes/topics/functions.php

@@ -4030 +4030 @@
  * @uses bbp_topics()
  * @uses bbp_the_topic()
- * @uses get_wp_title_rss()
  * @uses get_option()
- * @uses bloginfo_rss
+ * @uses bloginfo_rss()
  * @uses self_link()
  * @uses the_author()