Changeset 3357 for trunk/bp-core.php

Timestamp:

11/05/2010 09:37:15 PM (16 years ago)

Author:

djpaul

Message:

Fix some wp_debug warnings.

File:

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

trunk/bp-core.php

@@ -147 +147 @@
 
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
-    $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default', $bp->site_options['user-avatar-default'] );
+    $default_grav = isset( $bp->site_options['user-avatar-default'] ) ? $bp->site_options['user-avatar-default'] : 'wavatar';
+    $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default', $default_grav );
     $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', 'identicon' );
     $bp->grav_default->blog  = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
@@ -1018 +1019 @@
             $ud = false;
 
-            if ( $bp->loggedin_user->id == $user_id )
+            if ( isset( $bp->loggedin_user->id ) && $bp->loggedin_user->id == $user_id )
                 $ud = &$bp->loggedin_user->userdata;
 
-            if ( $bp->displayed_user->id == $user_id )
+            if ( isset( $bp->displayed_user->id ) && $bp->displayed_user->id == $user_id )
                 $ud = &$bp->displayed_user->userdata;
 
@@ -1138 +1139 @@
     if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
         if ( bp_is_active( 'xprofile' ) ) {
-            $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
+            $fullname = xprofile_get_field_data( $bp->site_options['bp-xprofile-fullname-field-name'], $user_id );
 
             if ( empty($fullname) ) {
@@ -1315 +1316 @@
     global $bp;
 
-    if ( empty( $bp->template_message ) )
+    if ( empty( $bp->template_message ) && isset( $_COOKIE['bp-message'] ) )
         $bp->template_message = $_COOKIE['bp-message'];
 
-    if ( empty( $bp->template_message_type ) )
+    if ( empty( $bp->template_message_type ) && isset( $_COOKIE['bp-message-type'] ) )
         $bp->template_message_type = $_COOKIE['bp-message-type'];