diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-02-02 11:52:55 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-02-02 18:01:15 +0100 |
| commit | d81c00304f8af4cdbc5739d1471f0261bcca6ccf (patch) | |
| tree | bc343d6cfbc3e9ff159b86b4e6fc57102b167cda /core | |
| parent | 3a6d065e503def8e9ca47dd6780b9ddbc0772509 (diff) | |
| download | nextcloud-server-d81c00304f8af4cdbc5739d1471f0261bcca6ccf.tar.gz nextcloud-server-d81c00304f8af4cdbc5739d1471f0261bcca6ccf.zip | |
Fix parsing empty Webdav property nodes
Return empty string instead of undefined
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/oc-backbone-webdav.js | 2 | ||||
| -rw-r--r-- | 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 d231a5b1ba0..ba678a32fcf 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 dbdfd3823e4..89c11516a38 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 || ''; }, /** |