Merge branch 'staging' into inviteUI

www/profile/inner.js

@@ -232,7 +232,7 @@ define([
         // If this curve has sent us a friend request, we should not be able to sent it to them
         var friendRequests = common.getFriendRequests();
         if (friendRequests[data.curvePublic]) {
-            $button.append(Messages._getKey('friendRequest_received', [data.name || Messages.anonymous]))
+            $button.append(Messages._getKey('friendRequest_received', [name || Messages.anonymous]))
                 .click(function () {
                 UIElements.displayFriendRequestModal(common, friendRequests[data.curvePublic]);
             });
@@ -299,7 +299,7 @@ define([
             $(muteButton).click(function () {
                 module.execCommand('MUTE_USER', {
                     curvePublic: data.curvePublic,
-                    name: data.displayName || data.name,
+                    name: Util.fixHTML(data.displayName || data.name),
                     avatar: data.avatar
                 }, function (e) {
                     if (e) { console.error(e); return void UI.warn(Messages.error); }