Changeset 8264

Timestamp:

02/18/2019 01:48:34 AM (8 years ago)

Author:

dd32

Message:

Support Forums: Don't output paged canonical links for user profiles.

Fixes #4170.

File:

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

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

@@ -304 +304 @@
          * Returns the canonical URL for various bbPress pages.
          *
-         * @return string The canonical URL.
+         * @return array The canonical URL.
          */
         public function get_canonical_url() {
-                $canonical_url = '';
+                $canonical_url  = false;
+                $supports_paged = true;
 
                 if ( bbp_is_topic_tag() ) {
@@ -321 +322 @@
                 } elseif ( bbpress()->displayed_user && bbpress()->displayed_user->exists() ) {
                         // This covers all user pages rather than using 6 different bbp_is_*() calls.
-                        $canonical_url = 'https://profiles.wordpress.org/' . bbpress()->displayed_user->user_nicename . '/';
-                }
-
-                return $canonical_url;
+                        $canonical_url  = 'https://profiles.wordpress.org/' . bbpress()->displayed_user->user_nicename . '/';
+                        $supports_paged = false;
+                }
+
+                return [ $canonical_url, $supports_paged ];
         }
 
@@ -331 +333 @@
          */
         public function rel_canonical() {
-                $canonical_url = $this->get_canonical_url();
+                list( $canonical_url, $canonical_supports_paged ) = $this->get_canonical_url();
 
                 if ( bbp_is_single_topic() || bbp_is_single_forum() ) {
@@ -339 +341 @@
                 // Make sure canonical has pagination if needed.
                 $page = get_query_var( 'paged', 0 );
-                if ( $canonical_url && $page >= 2 ) {
+                if ( $canonical_url && $canonical_supports_paged && $page >= 2 ) {
                         $canonical_url .= 'page/' . absint( $page ) . '/';
                 }
@@ -354 +356 @@
                 global $wp_query;
 
-                $canonical_url = $this->get_canonical_url();
-                $max_pages     = $wp_query->max_num_pages;
+                list( $canonical_url ) = $this->get_canonical_url();
+
+                $max_pages = $wp_query->max_num_pages;
 
                 if ( bbp_is_single_view() ) {