infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into inviteUI

pull/1/head
yflory 2019-12-18 16:23:15 +01:00
parent e6e1ef72e7 032186cc4c
commit 563e2161c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/profile/inner.js
View File

@ -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); }