Ticket #6230: 6230.reset-single-pages.patch

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

@@ -357 +357 @@
 function bp_core_load_template( $templates ) {
         global $wp_query;
 
-        // Reset the post
-        bp_theme_compat_reset_post( array(
-                'ID'          => 0,
-                'is_404'      => true,
-                'post_status' => 'publish',
-        ) );
-
-        // Set theme compat to false since the reset post function automatically sets
-        // theme compat to true
-        bp_set_theme_compat_active( false );
+        // Reset post if not on a directory page
+        // if we're not on a directory page, this means we're faking a page and we
+        // need to reset the post to avoid notices
+        if ( ! bp_is_directory() ) {
+                bp_theme_compat_reset_post( array(
+                        'ID'          => 0,
+                        'is_404'      => true,
+                        'post_status' => 'publish',
+                ) );
+
+                // Set theme compat to false since the reset post function automatically sets
+                // theme compat to true
+                bp_set_theme_compat_active( false );
+        }
 
         // Fetch each template and add the php suffix
         $filtered_templates = array();