Ticket #4335: 4335.01.patch

bp-themes/bp-default/functions.php

@@ -545 +545 @@
                 case 'groups' :
                 case 'friends' :
                         // Only insert avatar if one exists
-                        if ( $secondary_avatar = bp_get_activity_secondary_avatar() ) {
+                        if ( bp_is_active( $activity->component ) && $secondary_avatar = bp_get_activity_secondary_avatar() ) {
                                 $reverse_content = strrev( $action );
                                 $position        = strpos( $reverse_content, 'a<' );
                                 $action          = substr_replace( $action, $secondary_avatar, -$position - 2, 0 );