Changeset 4949

Timestamp:

08/09/2011 04:27:45 PM (15 years ago)

Author:

boonebgorges

Message:

Don't throw PHP notices when bp_loggedin_user_ and bp_displayed_user_ functions are used incorrectly

File:

• trunk/bp-members/bp-members-template.php (modified) (6 diffs)

trunk/bp-members/bp-members-template.php

@@ -854 +854 @@
 function bp_displayed_user_id() {
         global $bp;
-        return apply_filters( 'bp_displayed_user_id', isset( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0 );
+        return apply_filters( 'bp_displayed_user_id', !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0 );
 }
         function bp_current_user_id() { return bp_displayed_user_id(); }
@@ -860 +860 @@
 function bp_loggedin_user_id() {
         global $bp;
-        return apply_filters( 'bp_loggedin_user_id', isset( $bp->displayed_user->id ) ? $bp->loggedin_user->id : 0 );
+        return apply_filters( 'bp_loggedin_user_id', !empty( $bp->displayed_user->id ) ? $bp->loggedin_user->id : 0 );
 }
 
@@ -878 +878 @@
         function bp_get_displayed_user_fullname() {
                 global $bp;
-
-                return apply_filters( 'bp_displayed_user_fullname', $bp->displayed_user->fullname );
+                return apply_filters( 'bp_displayed_user_fullname', isset( $bp->displayed_user->fullname ) ? $bp->displayed_user->fullname : '' );
         }
         function bp_user_fullname() { echo bp_get_displayed_user_fullname(); }
@@ -889 +888 @@
         function bp_get_loggedin_user_fullname() {
                 global $bp;
-                return apply_filters( 'bp_get_loggedin_user_fullname', $bp->loggedin_user->fullname );
+                return apply_filters( 'bp_get_loggedin_user_fullname', isset( $bp->loggedin_user->fullname ) ? $bp->loggedin_user->fullname : '' );
         }
 
@@ -897 +896 @@
         function bp_get_displayed_user_username() {
                 global $bp;
-                return apply_filters( 'bp_get_displayed_user_username', bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) );
+                
+                if ( !empty( $bp->displayed_user->id ) ) {
+                        $username = bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login );
+                } else {
+                        $username = '';
+                }
+                
+                return apply_filters( 'bp_get_displayed_user_username', $username );
         }
 
@@ -905 +911 @@
         function bp_get_loggedin_user_username() {
                 global $bp;
-                return apply_filters( 'bp_get_loggedin_user_username', bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) );
+                
+                if ( !empty( $bp->loggedin_user->id ) ) {
+                        $username = bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
+                } else {
+                        $username = '';
+                }
+                
+                return apply_filters( 'bp_get_loggedin_user_username', $username );
         }