Changeset 1982

Timestamp:

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

Author:

apeatling

Message:

Fixes #1096 props messenlehner

Location:

trunk

Files:

• bp-core.php (modified) (3 diffs)
• bp-core/deprecated/bp-core-deprecated.php (modified) (1 diff)
• bp-groups.php (modified) (2 diffs)
• bp-themes/bp-sn-parent/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-sn-parent/profile/profile-menu.php (modified) (1 diff)
• bp-themes/bp-sn-parent/userbar.php (modified) (1 diff)
• bp-themes/deprecated/bpmember/activity/just-me.php (modified) (1 diff)

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;
+    }
+}
 
 /**

trunk/bp-core/deprecated/bp-core-deprecated.php

@@ -940 +940 @@
 }
 
-/* DEPRECATED - use the param 'default_subnav_slug' in bp_core_new_nav_item() */
+/* DEPRECATED - use the param 'default_subnav_slug' in bp_core_new_nav_item() OR bp_core_new_nav_default() */
 function bp_core_add_nav_default( $parent_id, $function, $slug = false, $user_has_access = true, $admin_only = false ) {
     global $bp;

trunk/bp-groups.php

@@ -261 +261 @@
             
             /* Add a new default subnav item for when the groups nav is selected. */
-            bp_core_add_nav_default( $bp->groups->slug, 'groups_screen_group_home', 'home' );
+            bp_core_new_nav_default( array( 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_home', 'subnav_slug' => 'home' ) );
             
             /* Add the "Home" subnav item, as this will always be present */
@@ -299 +299 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->groups->slug && empty( $bp->current_action ) ) {
+    if ( $bp->current_component == $bp->groups->slug && empty( $bp->current_action ) && empty( $bp->current_item ) ) {
         $bp->is_directory = true;
 

trunk/bp-themes/bp-sn-parent/_inc/ajax.php

@@ -304 +304 @@
             $ud = get_userdata($user_id);
             $username = $ud->user_login;
-            echo bp_core_get_avatar( $user_id, 1, 15, 15 ) . ' ' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
+            echo bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) ) . ' ' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
             ';
         }       

trunk/bp-themes/bp-sn-parent/profile/profile-menu.php

@@ -1 +1 @@
 <?php do_action( 'bp_before_profile_menu' ) ?>
 
-<?php bp_the_avatar() ?>
+<?php bp_displayed_user_avatar( 'type=full' ) ?>
 
 <div class="button-block">

trunk/bp-themes/bp-sn-parent/userbar.php

@@ -9 +9 @@
         
         <p class="avatar">
-            <?php bp_loggedinuser_avatar_thumbnail() ?>
+            <?php bp_loggedin_user_avatar( 'type=thumb' ) ?>
         </p>
         

trunk/bp-themes/deprecated/bpmember/activity/just-me.php

@@ -9 +9 @@
     
     <div class="left-menu">
-        <?php bp_the_avatar() ?>
+        <?php bp_displayed_user_avatar() ?>
         
         <div class="button-block">