From 33b1376b5ce5f81d36f13aae69ef804f5f4cc0ee Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 20 Oct 2023 14:19:35 +0200
Subject: [PATCH] Fix undefined user hash in localStorage #1298

---
 www/common/sframe-common-outer.js | 2 +-
 www/settings/main.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index a24cbe290..4ccda4b68 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1235,7 +1235,7 @@ define([
                     var nSecret = secret;
                     if (cfg.isDrive) {
                         // Shared folder or user hash or fs hash
-                        var hash = Utils.LocalStore.getUserHash() || Utils.LocalStore.getFSHash();
+                        var hash = Cryptpad.userHash || Utils.LocalStore.getFSHash();
                         if (data.sharedFolder) { hash = data.sharedFolder.hash; }
                         if (hash) {
                             var password = (data.sharedFolder && data.sharedFolder.password) || undefined;
diff --git a/www/settings/main.js b/www/settings/main.js
index 371c4f899..5fdeab860 100644
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -51,7 +51,7 @@ define([
                 require([
                     '/common/cryptget.js',
                 ], function (Crypt) {
-                    var k = Utils.LocalStore.getUserHash() || Utils.LocalStore.getFSHash();
+                    var k = Cryptpad.userHash || Utils.LocalStore.getFSHash();
                     Crypt.put(k, sjson, function (err) {
                         cb(err);
                     });