Fix avatars of users in guest sytem messages

Signed-off-by: Joas Schilling <[email protected]>

Author: nickvergessen

js/richobjectstringparser.js

@@ -18,8 +18,8 @@
 					'<span class="mention-user avatar-name-wrapper {{#if isCurrentUser}}currentUser{{/if}}">' +
 						'<span class="avatar" ' +
 								'data-username="{{id}}" ' +
-								'data-user="{{id}}" ' +
-								'data-user-display-name="{{name}}">' +
+								'data-user-id="{{id}}" ' +
+								'data-displayname="{{name}}">' +
 						'</span>' +
 						'<strong>{{name}}</strong>' +
 					'</span>' +

js/views/chatview.js

@@ -533,10 +533,10 @@
 			$el.find('.has-tooltip').tooltip({container: this._tooltipContainer});
 
 			var setAvatar = function($element, size) {
-				if (!model || model.get('actorType') === 'users') {
+				if ($element.data('user-id')) {
 					$element.avatar($element.data('user-id'), size, undefined, false, undefined, $element.data('displayname'));
 				} else {
-					$element.imageplaceholder('?', model.get('actorDisplayName'), size);
+					$element.imageplaceholder('?', $element.data('displayname'), size);
 					$element.css('background-color', '#b9b9b9');
 				}
 			};