Changeset 13492

Timestamp:

05/29/2023 05:51:12 AM (16 months ago)

Author:

imath

Message:

Make sure BP_Component::parse_query() always run

Only running it when BP Rewrites are on is not the right way to go as some plugins might have been using the WP Rewrites API for a while and might have extended this method from their component's class.

Instead of only running this method if BP Rewrites are on, we're adding a URL parser check inside each component having a directory to figure out whether it's needed to set BP URI globals.

See #4954
Fixes #8908
Closes ​https://github.com/buddypress/buddypress/pull/109

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-template-loader.php (modified) (1 diff)
• bp-core/classes/class-bp-component.php (modified) (2 diffs)
• bp-core/classes/class-bp-core.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

@@ -506 +506 @@
      */
     public function parse_query( $query ) {
+        /*
+         * If BP Rewrites are not in use, no need to parse BP URI globals another time.
+         * Legacy Parser should have already set these.
+         */
+        if ( 'rewrites' !== bp_core_get_query_parser() ) {
+            return parent::parse_query( $query );
+        }
+
         if ( bp_is_directory_homepage( $this->id ) ) {
             $query->set( $this->rewrite_ids['directory'], 1 );

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

@@ -445 +445 @@
      */
     public function parse_query( $query ) {
-        if ( ! is_multisite() ) {
+        /*
+         * Only Multisite configs have a Sites directory.
+         * If BP Rewrites are not in use, no need to parse BP URI globals another time.
+         * Legacy Parser should have already set these.
+         */
+        if ( ! is_multisite() || 'rewrites' !== bp_core_get_query_parser() ) {
             return parent::parse_query( $query );
         }

trunk/src/bp-core/bp-core-template-loader.php

@@ -566 +566 @@
     }
 
-    // Set some needed URI globals.
-    $bp                        = buddypress();
-    $bp->unfiltered_uri        = explode( '/', $GLOBALS['wp']->request );
-    $bp->unfiltered_uri_offset = 0;
+    // Eventually Set some missing URI globals.
+    $bp = buddypress();
+
+    if ( ! $bp->unfiltered_uri ) {
+        $bp->unfiltered_uri        = explode( '/', $GLOBALS['wp']->request );
+        $bp->unfiltered_uri_offset = 0;
+    }
 
     /**

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

@@ -578 +578 @@
 
         // Allow components to parse the main query.
-        if ( 'rewrites' === bp_core_get_query_parser() ) {
-            /**
-             * Only fire this hook when pretty links are disabled.
-             *
-             * @todo Remove once BP Rewrites merge process is ended.
-             */
-            add_action( 'bp_parse_query',  array( $this, 'parse_query' ), 10 );
-        }
+        add_action( 'bp_parse_query',  array( $this, 'parse_query' ), 10 );
 
         // Generate rewrite rules.
@@ -1236 +1229 @@
      */
     public function parse_query( $query ) {
-        if ( is_buddypress() ) {
+        if ( is_buddypress() && 'rewrites' === bp_core_get_query_parser() ) {
             add_filter( 'posts_pre_query', array( $this, 'pre_query' ), 10, 2 );
         }

trunk/src/bp-core/classes/class-bp-core.php

@@ -424 +424 @@
      */
     public function parse_query( $query ) {
+        /*
+         * If BP Rewrites are not in use, no need to parse BP URI globals another time.
+         * Legacy Parser should have already set these.
+         */
+        if ( 'rewrites' !== bp_core_get_query_parser() ) {
+            return parent::parse_query( $query );
+        }
+
         $is_search = $query->get( 'pagename' ) === bp_get_search_slug() || ( isset( $_GET['bp_search'] ) && 1 === (int) $_GET['bp_search'] );
 

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

@@ -1067 +1067 @@
      */
     public function parse_query( $query ) {
+        /*
+         * If BP Rewrites are not in use, no need to parse BP URI globals another time.
+         * Legacy Parser should have already set these.
+         */
+        if ( 'rewrites' !== bp_core_get_query_parser() ) {
+            return parent::parse_query( $query );
+        }
+
         if ( bp_is_directory_homepage( $this->id ) ) {
             $query->set( $this->rewrite_ids['directory'], 1 );

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

@@ -777 +777 @@
      */
     public function parse_query( $query ) {
+        /*
+         * If BP Rewrites are not in use, no need to parse BP URI globals another time.
+         * Legacy Parser should have already set these.
+         */
+        if ( 'rewrites' !== bp_core_get_query_parser() ) {
+            return parent::parse_query( $query );
+        }
+
         // Init the current member and member type.
         $member      = false;