Changeset 3369 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

11/07/2010 12:20:02 AM (14 years ago)

Author:

djpaul

Message:

Fixes even more WP_DEBUG warnings.

File:

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

trunk/bp-activity/bp-activity-templatetags.php

@@ -445 +445 @@
 
         // If this is a user object pass the users' email address for Gravatar so we don't have to refetch it.
-        if ( 'user' == $object && empty( $email ) )
+        if ( 'user' == $object && empty( $email ) && isset( $activities_template->activity->user_email ) )
             $email = $activities_template->activity->user_email;
 
@@ -656 +656 @@
                 return false;
 
-            $content .= '<ul>';
+            $content = '<ul>';
             foreach ( (array)$comment->children as $comment ) {
                 if ( !$comment->user_fullname )
@@ -999 +999 @@
         global $bp;
 
+        $link = '';
+
         if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action )
             $link = $bp->displayed_user->domain . $bp->activity->slug . '/feed/';
-        else if ( $bp->friends->slug == $bp->current_action )
+        elseif ( $bp->friends->slug == $bp->current_action )
             $link = $bp->displayed_user->domain . $bp->activity->slug . '/' . $bp->friends->slug . '/feed/';
-        else if ( $bp->groups->slug == $bp->current_action )
+        elseif ( $bp->groups->slug == $bp->current_action )
             $link = $bp->displayed_user->domain . $bp->activity->slug . '/' . $bp->groups->slug . '/feed/';
-        else if ( 'favorites' == $bp->current_action )
+        elseif ( 'favorites' == $bp->current_action )
             $link = $bp->displayed_user->domain . $bp->activity->slug . '/favorites/feed/';
-        else if ( 'mentions' == $bp->current_action )
+        elseif ( 'mentions' == $bp->current_action )
             $link = $bp->displayed_user->domain . $bp->activity->slug . '/mentions/feed/';