From efb0f6e23b3dfc8e6f239f9dddc01b8bdd221e64 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 3 Nov 2014 17:49:09 +0000
Subject: [PATCH] Backwards compat for old-style avatar_urls

---
 webclient/room/room.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webclient/room/room.html b/webclient/room/room.html
index cd2a5e9c23..60b875f17b 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -134,7 +134,8 @@
                     </div>
                 </td>
                 <td class="avatar">
-                    <img class="avatarImage" ng-src="{{ msg.room_member.content.avatar_url || 'img/default-profile.png' }}" width="32" height="32" title="{{msg.user_id}}"
+                    <!-- msg.room_member.avatar_url is just backwards compat, and can be removed in the future. -->
+                    <img class="avatarImage" ng-src="{{ msg.room_member.content.avatar_url || msg.room_member.avatar_url || 'img/default-profile.png' }}" width="32" height="32" title="{{msg.user_id}}"
                          ng-hide="room.events[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/>
                 </td>
                 <td ng-class="(!msg.content.membership && ('m.room.topic' !== msg.type && 'm.room.name' !== msg.type))? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'">