Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-09-12 11:29:57 +02:00
parent 63700cb791 da0e31fa54
commit 5b3667fd4e
5 changed files with 36 additions and 7 deletions
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -657,7 +657,9 @@ define([
            var fData = files[FILES_DATA];
            getFiles([FILES_DATA]).forEach(function (id) {
                if (filesList.indexOf(id) === -1) {
-                    removePadAttribute(fData[id].href);
+                    if (fData[id] && fData[id].href) {
+                        removePadAttribute(fData[id].href);
+                    }
                    spliceFileData(id);
                }
            });