web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve conflict and merge

Browse Source
This commit is contained in:
ansuz 2016-08-25 18:01:03 +02:00
parent f47a6f1cbb
commit 7c5ee53e81
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/pad/main.js
View File

@ -259,7 +259,7 @@ define([
var setName = module.setName = function (newName) { var setName = module.setName = function (newName) {
if (!(typeof(newName) === 'string' && newName.trim())) { return; } if (!(typeof(newName) === 'string' && newName.trim())) { return; }
var myUserNameTemp = newName.trim(); var myUserNameTemp = Cryptpad.fixHTML(newName.trim());
if(myUserNameTemp.length > 32) { if(myUserNameTemp.length > 32) {
myUserNameTemp = myUserNameTemp.substr(0, 32); myUserNameTemp = myUserNameTemp.substr(0, 32);
} }