Ticket #3422: 3422.01.patch

bp-core/bp-core-functions.php

@@ -92 +92 @@
                 }
         }
 
+        foreach( $page_ids as $component_name => $page_id ) {
+                if ( empty( $component_name ) || empty( $page_id ) )
+                        unset( $page_ids[$component_name] );
+        }
+
         return apply_filters( 'bp_core_get_page_meta', $page_ids );
 }
 
@@ -121 +126 @@
 function bp_core_get_page_names() {
         global $wpdb, $bp;
 
-        // Set pages as standard class
-        $pages = new stdClass;
-
         // Get pages and IDs
         if ( $page_ids = bp_core_get_page_meta() ) {
+                
+                // Set pages as standard class
+                $pages = new stdClass;
 
                 $posts_table_name = bp_is_multiblog_mode() ? $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts' : $wpdb->posts;
                 $page_ids_sql     = implode( ',', (array)$page_ids );
@@ -1068 +1073 @@
 
         if ( empty( $bp->pages ) )
                 $bp->pages = bp_core_get_page_names();
-
+                
         $match = false;
-
+        
         // Check if the slug is registered in the $bp->pages global
         foreach ( (array)$bp->pages as $key => $page ) {
                 if ( $key == $slug || $page->slug == $slug )