Changeset 13519

Timestamp:

07/16/2023 03:43:26 PM (21 months ago)

Author:

imath

Message:

Make sure bp_core_new_nav_default() is ready for the BP Rewrites API

• In case plain permalinks are used, use the $GLOBALS['wp']->query_string to set the buddypress()->unfiltered_uri global.
• Do not edit sub nav links when calling bp_core_new_nav_default() if the URL parser is set to 'rewrites'.
• Avoid a PHP notice if the new sub nav object misses the slug and/or the link properties.

Props corzel

See #4954
Fixes #8936
Closes ​https://github.com/buddypress/buddypress/pull/130

Location:

trunk/src/bp-core

Files:

• bp-core-buddybar.php (modified) (1 diff)
• bp-core-template-loader.php (modified) (1 diff)

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

@@ -344 +344 @@
     );
 
-    /**
-     * Update secondary nav items:
-     * - The previous default nav item needs to have its slug added to its link property.
-     * - The new default nav item needs to have its slug removed from its link property.
-     */
-    $previous_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $parent_nav->default_subnav_slug );
-
-    // Edit the link of the previous default nav item.
-    $bp->members->nav->edit_nav(
-        array(
-            'link' => trailingslashit( $previous_default_subnav->link . $previous_default_subnav->slug ),
-        ),
-        $previous_default_subnav->slug,
-        $parent_nav->slug
-    );
-
-    $new_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $r['subnav_slug'] );
-
-    // Edit the link of the new default nav item.
-    $bp->members->nav->edit_nav(
-        array(
-            'link' => rtrim( untrailingslashit( $new_default_subnav->link ), $new_default_subnav->slug ),
-        ),
-        $new_default_subnav->slug,
-        $parent_nav->slug
-    );
+    // Only edit old & new default subnavs when using the Legacy URL parser.
+    if ( 'rewrites' !== bp_core_get_query_parser() ) {
+        /**
+         * Update secondary nav items:
+         * - The previous default nav item needs to have its slug added to its link property.
+         * - The new default nav item needs to have its slug removed from its link property.
+         */
+        $previous_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $parent_nav->default_subnav_slug );
+
+        // Edit the link of the previous default nav item.
+        $bp->members->nav->edit_nav(
+            array(
+                'link' => trailingslashit( $previous_default_subnav->link . $previous_default_subnav->slug ),
+            ),
+            $previous_default_subnav->slug,
+            $parent_nav->slug
+        );
+
+        $new_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $r['subnav_slug'] );
+
+        // Make sure the `$new_default_subnav` properties are set.
+        if ( isset( $new_default_subnav->link, $new_default_subnav->slug ) ) {
+            // Edit the link of the new default nav item.
+            $bp->members->nav->edit_nav(
+                array(
+                    'link' => rtrim( untrailingslashit( $new_default_subnav->link ), $new_default_subnav->slug ),
+                ),
+                $new_default_subnav->slug,
+                $parent_nav->slug
+            );
+        }
+    }
 
     if ( bp_is_current_component( $parent_nav->slug ) ) {

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

@@ -570 +570 @@
 
     if ( ! $bp->unfiltered_uri ) {
-        $bp->unfiltered_uri        = explode( '/', $GLOBALS['wp']->request );
+        $unfiltered_uri = explode( '/', $GLOBALS['wp']->request );
+
+        // Make sure to set the BP unfiltered_uri global when plain links are used.
+        if ( ! bp_has_pretty_urls() ) {
+            $bp_directories = array();
+            foreach ( $bp->pages as $component_id => $page_properties ) {
+                if ( isset( $bp->{$component_id}->rewrite_ids['directory'] ) ) {
+                    $bp_directories[ $bp->{$component_id}->rewrite_ids['directory'] ] = $page_properties->slug;
+                } elseif ( 'activate' === $component_id || 'register' === $component_id ) {
+                    $bp_directories[ 'bp_member_' . $component_id ] = $page_properties->slug;
+                }
+            }
+
+            $url_query_chunks = bp_parse_args( $GLOBALS['wp']->query_string, array() );
+            $directory        = key( $url_query_chunks );
+            if ( isset( $bp_directories[ $directory ] ) ) {
+                $url_query_chunks[ $directory ] = $bp_directories[ $directory ];
+            }
+
+            $unfiltered_uri = array_values( $url_query_chunks );
+        }
+
+        $bp->unfiltered_uri        = $unfiltered_uri;
         $bp->unfiltered_uri_offset = 0;
     }