Changeset 13522

Timestamp:

07/20/2023 03:07:17 AM (17 months ago)

Author:

imath

Message:

Do the homepage directory check only when the requested URL is home

Fixes #8939
See #4954
Closes ​https://github.com/buddypress/buddypress/pull/133

Location:

trunk/src

Files:

• bp-activity/classes/class-bp-activity-component.php (modified) (1 diff)
• bp-blogs/classes/class-bp-blogs-component.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-groups/classes/class-bp-groups-component.php (modified) (1 diff)
• bp-members/classes/class-bp-members-component.php (modified) (1 diff)

trunk/src/bp-activity/classes/class-bp-activity-component.php

@@ -482 +482 @@
         }
 
-        if ( bp_is_directory_homepage( $this->id ) ) {
+        if ( home_url( '/' ) === bp_get_requested_url() && bp_is_directory_homepage( $this->id ) ) {
             $query->set( $this->rewrite_ids['directory'], 1 );
         }

trunk/src/bp-blogs/classes/class-bp-blogs-component.php

@@ -461 +461 @@
         $bp = buddypress();
 
-        if ( bp_is_directory_homepage( $this->id ) ) {
+        if ( home_url( '/' ) === bp_get_requested_url() && bp_is_directory_homepage( $this->id ) ) {
             $query->set( $this->rewrite_ids['directory'], 1 );
         }

trunk/src/bp-core/bp-core-catchuri.php

@@ -564 +564 @@
          */
         if ( false !== $front_page_component && bp_is_current_component( $front_page_component ) && ! bp_current_action() && ! bp_get_current_member_type() ) {
-            $bp->canonical_stack['canonical_url'] = bp_get_root_url();
+            $bp->canonical_stack['canonical_url'] = trailingslashit( bp_get_root_url() );
 
         // Except when the front page is set to the registration page

trunk/src/bp-core/bp-core-filters.php

@@ -977 +977 @@
 
             $post = (object) array(
-                'ID'                    => $directory->id,
+                'ID'                    => (int) $directory->id,
                 'post_author'           => 0,
                 'post_date'             => $null,

trunk/src/bp-groups/classes/class-bp-groups-component.php

@@ -1053 +1053 @@
         }
 
-        if ( bp_is_directory_homepage( $this->id ) ) {
+        if ( home_url( '/' ) === bp_get_requested_url() && bp_is_directory_homepage( $this->id ) ) {
             $query->set( $this->rewrite_ids['directory'], 1 );
         }

trunk/src/bp-members/classes/class-bp-members-component.php

@@ -791 +791 @@
         }
 
-        if ( bp_is_directory_homepage( $this->id ) ) {
+        if ( home_url( '/' ) === bp_get_requested_url() && bp_is_directory_homepage( $this->id ) ) {
             $query->set( $this->rewrite_ids['directory'], 1 );
         }