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

2017-01-02 15:43:06 +01:00 · 2017-01-02 15:43:06 +01:00 · 2b5085625c
commit 2b5085625c
parent f01c3725af 69b1764c9d
1 changed files with 1 additions and 1 deletions
--- a/www/file/main.js
+++ b/www/file/main.js
@ -243,7 +243,7 @@ define([
        };

        var ownFileManager = function () {
-            return localStorage.FS_hash === APP.hash;
+            return Cryptpad.getUserHash() === APP.hash || localStorage.FS_hash === APP.hash;
        };

        var removeSelected =  function () {