Changeset 4933

Timestamp:

08/06/2011 12:39:28 PM (14 years ago)

Author:

boonebgorges

Message:

Avoid variable type errors when bp-pages is manually deleted from database. Fixes #3440

File:

• trunk/bp-core/bp-core-functions.php (modified) (2 diffs)

trunk/bp-core/bp-core-functions.php

@@ -93 +93 @@
     }
 
-    foreach( (array)$page_ids as $component_name => $page_id ) {
-        if ( empty( $component_name ) || empty( $page_id ) ) {
-            unset( $page_ids[$component_name] );
+    // Ensure that empty indexes are unset. Should only matter in edge cases
+    if ( $page_ids && is_array( $page_ids ) ) {
+        foreach( (array)$page_ids as $component_name => $page_id ) {
+            if ( empty( $component_name ) || empty( $page_id ) ) {
+                unset( $page_ids[$component_name] );
+            }
         }
     }
@@ -127 +130 @@
 function bp_core_get_directory_pages() {
     global $wpdb, $bp;
+    
+    // Set pages as standard class
+    $pages = new stdClass;
 
     // Get pages and IDs
     if ( $page_ids = bp_core_get_directory_page_ids() ) {
-
-        // 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;