Changeset 1982 for trunk/bp-core.php

Timestamp:

09/28/2009 10:49:53 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1096 props messenlehner

File:

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

trunk/bp-core.php

@@ -572 +572 @@
  */
 function bp_core_get_displayed_userid( $user_login ) {
-    return apply_filters( 'bp_core_get_displayed_userid', bp_core_get_userid_from_user_login( $user_login ) );
+    return apply_filters( 'bp_core_get_displayed_userid', bp_core_get_userid( $user_login ) );
 }
 
@@ -584 +584 @@
  */
 function bp_core_new_nav_item( $args = '' ) {
-    global $bp, $temp_nav;
-
-    $temp_nav[] = $args;
-    
+    global $bp;
+
     $defaults = array(
         'name' => false, // Display name for the nav item
@@ -639 +637 @@
 }
 
+/**
+ * bp_core_new_nav_default()
+ *
+ * Modify the default subnav item to load when a top level nav item is clicked.
+ * 
+ * @package BuddyPress Core
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ */
+function bp_core_new_nav_default( $args = '' ) {
+    global $bp;
+    
+    $defaults = array(
+        'parent_slug' => false, // Slug of the parent
+        'screen_function' => false, // The name of the function to run when clicked
+        'subnav_slug' => false // The slug of the subnav item to select when clicked
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+
+    if ( $bp->current_component == $parent_slug && !$bp->current_action ) {
+        if ( !is_object( $screen_function[0] ) )
+            add_action( 'wp', $screen_function, 3 );
+        else
+            add_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+
+        if ( $subnav_slug )
+            $bp->current_action = $subnav_slug;
+    }
+}
 
 /**