Ticket #6230: bp-core-theme-compatibility.php.diff

bp-core-theme-compatibility.php

@@ -453 +453 @@
  *        properties of {@link WP_Post}; see that class for more details.
  */
 function bp_theme_compat_reset_post( $args = array() ) {
-        global $wp_query, $post;
+        global $wp_query, $post, $bp;
+
+        // set proper page ID if one exists for the current component
+        if ( empty( $args['ID'] ) ) {
+                $page_ids = bp_get_option( 'bp-pages' );
+                if ( isset( $page_ids[$bp->current_component] ) ) {
+                        $args['ID'] = $page_ids[$bp->current_component];
+                }
+        }
 
         // Switch defaults if post is set
         if ( isset( $wp_query->post ) ) {