From 2ba6e40161445bfbcdb09336c187d0b5736fdb5b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Sat, 13 Jul 2019 10:07:04 +0200
Subject: [PATCH] Fix issue with merging anon drive

---
 www/common/mergeDrive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/mergeDrive.js b/www/common/mergeDrive.js
index 9247656e1..aa6e57b0a 100644
--- a/www/common/mergeDrive.js
+++ b/www/common/mergeDrive.js
@@ -49,7 +49,7 @@ define([
                             // We want to merge an edit pad: check if we have the same channel
                             // but read-only and upgrade it in that case
                             datas.forEach(function (pad) {
-                                if (!pad.href) { data.href = pad.href; }
+                                if (pad.data && !pad.data.href) { pad.data.href = data.href; }
                             });
                             return;
                         }