Ticket #7963: 7963.01.diff

src/bp-templates/bp-nouveau/includes/activity/functions.php

@@ -359 +359 @@
                 case 'groups':
                 case 'friends':
                         // Only insert avatar if one exists.
-                        if ( $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 );
+                        if ( $secondary_avatar = bp_get_activity_secondary_avatar( array( 'linked' => false ) ) ) {
+                                $link_close  = '">';
+                                $first_link  = strpos( $action, $link_close );
+                                $second_link = strpos( $action, $link_close, $first_link + strlen( link_close ) );
+                                $action      = substr_replace( $action, $secondary_avatar, $second_link + 2, 0 );
                         }
                         break;
         }