summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-26 11:37:37 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-26 11:37:37 +0100
commit6cb95f4e42028f0959d4139593a16decbbc4b053 (patch)
tree224411064a926c2fd3f27524c3d8deb32abe87f5 /apps/dav
parent528546066973658445d6fd0fe22814e0a062fdca (diff)
parent2ef62b0115e4eeb714620cdd13df72d9731d05f7 (diff)
downloadnextcloud-server-6cb95f4e42028f0959d4139593a16decbbc4b053.tar.gz
nextcloud-server-6cb95f4e42028f0959d4139593a16decbbc4b053.zip
Merge pull request #21853 from owncloud/tags-fixpropertyma
Fix oc:tags tag list serializer
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/lib/connector/sabre/taglist.php4
-rw-r--r--apps/dav/lib/connector/sabre/tagsplugin.php2
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/dav/lib/connector/sabre/taglist.php b/apps/dav/lib/connector/sabre/taglist.php
index fda3aa04ecd..5c1cd8b4f1d 100644
--- a/apps/dav/lib/connector/sabre/taglist.php
+++ b/apps/dav/lib/connector/sabre/taglist.php
@@ -114,9 +114,7 @@ class TagList implements Element {
function xmlSerialize(Writer $writer) {
foreach ($this->tags as $tag) {
- $writer->startElement(self::NS_OWNCLOUD . ':tag');
- $writer->writeElement($tag);
- $writer->endElement();
+ $writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
}
}
}
diff --git a/apps/dav/lib/connector/sabre/tagsplugin.php b/apps/dav/lib/connector/sabre/tagsplugin.php
index c26efe2f998..dfc1a2dd95d 100644
--- a/apps/dav/lib/connector/sabre/tagsplugin.php
+++ b/apps/dav/lib/connector/sabre/tagsplugin.php
@@ -109,7 +109,7 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin
public function initialize(\Sabre\DAV\Server $server) {
$server->xml->namespacesMap[self::NS_OWNCLOUD] = 'oc';
- $server->propertyMap[self::TAGS_PROPERTYNAME] = 'OCA\\DAV\\Connector\\Sabre\\TagList';
+ $server->xml->elementMap[self::TAGS_PROPERTYNAME] = 'OCA\\DAV\\Connector\\Sabre\\TagList';
$this->server = $server;
$this->server->on('propFind', array($this, 'handleGetProperties'));