From 7c5ee53e81fd35a7de6bd8a486783d26c0f61739 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 25 Aug 2016 18:01:03 +0200
Subject: [PATCH] resolve conflict and merge

---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 2cbbfd827..c2f62b91f 100644
--- 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);
                 }