From 1a7c4d5ebe49bb43b728ed3e1f6fdd0303511038 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 16 May 2017 11:25:37 +0200
Subject: [PATCH] Store the FS_hash in the user object after the merge

---
 www/common/mergeDrive.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/common/mergeDrive.js b/www/common/mergeDrive.js
index 4b41e1279..2f4632544 100644
--- a/www/common/mergeDrive.js
+++ b/www/common/mergeDrive.js
@@ -188,6 +188,10 @@ define([
                         newRecentPads.push(data);
                     }
                 });
+                if (!proxy.FS_hashes || !Array.isArray(proxy.FS_hashes)) {
+                    proxy.FS_hashes = [];
+                }
+                proxy.FS_hashes.push(localStorage.FS_hash);
             }
             if (typeof(cb) === "function") { cb(); }
         };