Changeset 9853

Timestamp:

05/12/2020 07:17:45 AM (4 years ago)

Author:

dd32

Message:

Support Forums: Correct the RSS feed title for Reviews.

See #2078.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -36 +36 @@
 
             // Add plugin or theme name to view feed titles.
-            add_action( 'bbp_feed', array( $this, 'add_compat_title_to_feed' ) );
+            add_filter( 'wp_title_rss', array( $this, 'title_correction_for_feed' ) );
 
             // Define the taxonomy and query vars for this view.
@@ -146 +146 @@
 
     /**
-     * Add plugin or theme name to view feed titles.
-     *
-     * bbPress uses 'All Topics' title for view feeds, which isn't useful when
-     * dealing with plugin or theme support.
-     *
-     * @see https://meta.trac.wordpress.org/ticket/2078
-     * @see https://bbpress.trac.wordpress.org/ticket/3064
-     */
-    public function add_compat_title_to_feed() {
-        if ( empty( $this->query['bbp_view'] ) || empty( $this->query[ $this->query_var() ] ) ) {
-            return;
-        }
-
-        add_filter( 'gettext', array( $this, 'title_correction_for_feed' ), 10, 3 );
-    }
-
-    /**
      * Replace 'All Topics' feed title with an appropriate view title
      * that includes the plugin or theme name.
      *
      * @see https://meta.trac.wordpress.org/ticket/2078
-     * @see https://bbpress.trac.wordpress.org/ticket/3064
-     *
-     * @param string $translation Translated text.
-     * @param string $text        Text to translate.
-     * @param string $domain      Text domain.
-     * @return string New feed title.
-     */
-    public function title_correction_for_feed( $translation, $text, $domain ) {
-        if ( 'bbpress' !== $domain || 'All Topics' !== $text ) {
-            return $translation;
-        }
-
-        remove_filter( 'gettext', array( $this, 'title_correction_for_feed' ), 10, 3 );
+     */
+    public function title_correction_for_feed( $title ) {
+        if ( empty( $this->query['bbp_view'] ) || empty( $this->query[ $this->query_var() ] ) ) {
+            return $title;
+        }
 
         $object = $this->get_object( $this->query[ $this->query_var() ] );
         if ( ! $object ) {
-            return $translation;
+            return $title;
         }
 
@@ -190 +165 @@
         switch ( $this->query['bbp_view'] ) {
             case $this->compat():
-                $translation = $this->compat_title();
+                $title = get_bloginfo_rss( 'name' ) . ' » ' . $this->compat_title();
                 break;
             case 'reviews':
-                $translation = $this->reviews_title();
+                $title = get_bloginfo_rss( 'name' ) . ' » ' . $this->reviews_title();
                 break;
             case 'active':
-                $translation = $this->active_title();
+                $title = get_bloginfo_rss( 'name' ) . ' » ' . $this->active_title();
                 break;
             case 'unresolved':
-                $translation = $this->unresolved_title();
+                $title = get_bloginfo_rss( 'name' ) . ' » ' . $this->unresolved_title();
                 break;
         }
 
-        return $translation;
+        return $title;
     }