Merge pull request #2534 from nextcloud/backport/2533/stable25

[stable25] feat: Handle complex location type
nextcloud · Jul 8, 2024 · ae6a6eb · ae6a6eb
2 parents 945347b + ddf6c3f
commit ae6a6eb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/Sabre/Album/PropFindPlugin.php b/lib/Sabre/Album/PropFindPlugin.php
@@ -36,6 +36,7 @@
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 use Sabre\DAV\Tree;
+use Sabre\DAV\Xml\Property\Complex;
 
 class PropFindPlugin extends ServerPlugin {
 	public const ORIGINAL_NAME_PROPERTYNAME = '{http://nextcloud.org/ns}original-name';
@@ -154,6 +155,10 @@ public function handleUpdateProperties($path, PropPatch $propPatch): void {
 		$node = $this->tree->getNodeForPath($path);
 		if ($node instanceof AlbumRoot) {
 			$propPatch->handle(self::LOCATION_PROPERTYNAME, function ($location) use ($node) {
+				if ($location instanceof Complex) {
+					$location = $location->getXml();
+				}
+
 				$this->albumMapper->setLocation($node->getAlbum()->getAlbum()->getId(), $location);
 				return true;
 			});