From d81c00304f8af4cdbc5739d1471f0261bcca6ccf Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 2 Feb 2016 11:52:55 +0100 Subject: [PATCH] Fix parsing empty Webdav property nodes Return empty string instead of undefined --- core/js/oc-backbone-webdav.js | 2 +- core/vendor/davclient.js/lib/client.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/js/oc-backbone-webdav.js b/core/js/oc-backbone-webdav.js index d231a5b1ba..ba678a32fc 100644 --- a/core/js/oc-backbone-webdav.js +++ b/core/js/oc-backbone-webdav.js @@ -92,7 +92,7 @@ for (var key in propStat.properties) { var propKey = key; - if (davProperties[key]) { + if (key in davProperties) { propKey = davProperties[key]; } props[propKey] = propStat.properties[key]; diff --git a/core/vendor/davclient.js/lib/client.js b/core/vendor/davclient.js/lib/client.js index dbdfd3823e..89c11516a3 100644 --- a/core/vendor/davclient.js/lib/client.js +++ b/core/vendor/davclient.js/lib/client.js @@ -243,7 +243,7 @@ dav.Client.prototype = { } } - return content || propNode.textContent || propNode.text; + return content || propNode.textContent || propNode.text || ''; }, /**