Changeset 5570

Timestamp:

12/17/2011 05:45:59 PM (15 years ago)

Author:

boonebgorges

Message:

Don't exclude pages in bp_core_exclude_pages() on non-root blogs.
Fixes #3864.
Props npetetin

File:

• branches/1.5/bp-core/bp-core-filters.php (modified) (1 diff)

branches/1.5/bp-core/bp-core-filters.php

@@ -14 +14 @@
 function bp_core_exclude_pages( $pages ) {
         global $bp;
-
-        if ( !empty( $bp->pages->activate ) )
-                $pages[] = $bp->pages->activate->id;
-
-        if ( !empty( $bp->pages->register ) )
-                $pages[] = $bp->pages->register->id;
-
-        if ( !empty( $bp->pages->forums ) && ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) && bp_forums_has_directory() && !bp_forums_is_installed_correctly() ) ) )
-                $pages[] = $bp->pages->forums->id;
+        
+        if ( bp_is_root_blog() ) {
+                if ( !empty( $bp->pages->activate ) )
+                        $pages[] = $bp->pages->activate->id;
+        
+                if ( !empty( $bp->pages->register ) )
+                        $pages[] = $bp->pages->register->id;
+        
+                if ( !empty( $bp->pages->forums ) && ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) && bp_forums_has_directory() && !bp_forums_is_installed_correctly() ) ) )
+                        $pages[] = $bp->pages->forums->id;
+        }
 
         return apply_filters( 'bp_core_exclude_pages', $pages );