Changeset 3972

Timestamp:

01/30/2011 09:22:18 PM (15 years ago)

Author:

boonebgorges

Message:

Check to make sure that BP pages exist before attempting to set the default slugs or exclude pages from the nav

Location:

trunk

Files:

• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-filters.php

@@ -13 +13 @@
     global $bp;
 
-    $pages[] = $bp->pages->activate->id;
-    $pages[] = $bp->pages->register->id;
+    if ( !empty( $bp->pages->activate ) )
+        $pages[] = $bp->pages->activate->id;
+
+    if ( !empty( $bp->pages->register ) )
+        $pages[] = $bp->pages->register->id;
 
     if ( !bp_is_active( 'forums' ) || ( function_exists( 'bp_forums_is_installed_correctly' ) && !bp_forums_is_installed_correctly() ) )
-        $pages[] = $bp->pages->forums->id;
+        if ( !empty( $bp->pages->forums ) )
+            $pages[] = $bp->pages->forums->id;
 
     return apply_filters( 'bp_core_exclude_pages', $pages );

trunk/bp-members/bp-members-functions.php

@@ -23 +23 @@
     global $bp;
 
-    if ( !defined( 'BP_MEMBERS_SLUG' ) )
+    if ( !defined( 'BP_MEMBERS_SLUG' ) && !empty( $bp->pages->members ) )
         define( 'BP_MEMBERS_SLUG', $bp->pages->members->slug );
-
-    if ( !defined( 'BP_REGISTER_SLUG' ) )
+    else if ( !defined( 'BP_MEMBERS_SLUG' ) )
+        define( 'BP_MEMBERS_SLUG', 'members' );
+
+    if ( !defined( 'BP_REGISTER_SLUG' ) && !empty( $bp->pages->register ) )
         define( 'BP_REGISTER_SLUG', $bp->pages->register->slug );
-
-    if ( !defined( 'BP_ACTIVATION_SLUG' ) )
+    else if ( !defined( 'BP_REGISTER_SLUG' ) )
+        define( 'BP_REGISTER_SLUG', 'register' );
+
+    if ( !defined( 'BP_ACTIVATION_SLUG' ) && !empty( $bp->pages->activate ) )
         define( 'BP_ACTIVATION_SLUG', $bp->pages->activate->slug );
+    else if ( !defined( 'BP_ACTIVATION_SLUG' ) )
+        define( 'BP_ACTIVATION_SLUG', 'activate' );
 
 }