Changeset 2055 for trunk/bp-core.php

Timestamp:

10/26/2009 05:31:43 PM (15 years ago)

Author:

apeatling

Message:

Merging 1.1 branch with trunk

File:

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

trunk/bp-core.php

@@ -66 +66 @@
 if ( !defined( 'BP_HOME_BLOG_SLUG' ) )
     define( 'BP_HOME_BLOG_SLUG', 'blog' );
+    
+/* Register BuddyPress themes contained within the theme folder */
+if ( function_exists( 'register_theme_folder' ) )
+    register_theme_folder( 'buddypress/bp-themes' );
 
 
@@ -626 +630 @@
     );
 
+    /***
+     * If this nav item is hidden for the displayed user, and
+     * the logged in user is not the displayed user
+     * looking at their own profile, don't create the nav item.
+     */
+    if ( !$show_for_displayed_user && !bp_is_home() )
+        return false;
+        
     /***
-     * If we are not viewing a user, and this is a root component, don't attach the
-     * default subnav function so we can display a directory or something else.
-     */
+     * If we are not viewing a user, and this is a root component, don't attach the
+     * default subnav function so we can display a directory or something else.
+     */
     if ( bp_core_is_root_component( $slug ) && !$bp->displayed_user->id )
         return;