Merge branch 'master' into staging

2017-09-12 12:20:47 +02:00
parent 5b3667fd4e 8c3e2dbe61
commit 5ac3e97dc8
3 changed files with 7 additions and 5 deletions
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -654,12 +654,8 @@ define([
            if (workgroup || (!Cryptpad.isLoggedIn() && !config.testMode)) { return; }

            var filesList = getFiles([ROOT, 'hrefArray', TRASH]);
-            var fData = files[FILES_DATA];
            getFiles([FILES_DATA]).forEach(function (id) {
                if (filesList.indexOf(id) === -1) {
-                    if (fData[id] && fData[id].href) {
-                        removePadAttribute(fData[id].href);
-                    }
                    spliceFileData(id);
                }
            });