resolve conflict and merge

8 years ago · 7c5ee53e81
parent f47a6f1cbb
commit 7c5ee53e81
1 changed files with 1 additions and 1 deletions
--- a/www/pad/main.js
+++ b/www/pad/main.js
@ -259,7 +259,7 @@ define([

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