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

6 years ago · 9a04f748b5
parent 6dd8615cab 3635d1305a
commit 9a04f748b5
1 changed files with 6 additions and 4 deletions
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@ -374,10 +374,12 @@ define([
                }
                return paths;
            }
-            for (var e in root) {
-                var nPath = path.slice();
-                nPath.push(e);
-                _findFileInRoot(nPath, file).forEach(addPaths);
+            if (isFolder(root)) {
+                for (var e in root) {
+                    var nPath = path.slice();
+                    nPath.push(e);
+                    _findFileInRoot(nPath, file).forEach(addPaths);
+                }
            }

            return paths;