summaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib/swift.php
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-03-31 13:12:04 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-03-31 13:12:04 +0200
commit2be2a5d2c5d8cbc671c4f301eb337fee20023538 (patch)
tree4b6870b52f5606883d239485f6e971b77bdbb956 /apps/files_external/lib/swift.php
parent6ac85480f7bffeb65fcbc5820ea7bd4ecd8f21ad (diff)
parent65e3f634000a2142f412b85d0443f241bb64a9ab (diff)
downloadnextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.tar.gz
nextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.zip
external storage: fix merge conflict, indentation
Diffstat (limited to 'apps/files_external/lib/swift.php')
-rw-r--r--apps/files_external/lib/swift.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index a6955d400f4..1337d9f581d 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -374,7 +374,7 @@ class Swift extends \OC\Files\Storage\Common {
'X-Object-Meta-Timestamp' => $mtime
)
);
- return $object->Update($settings);
+ return $object->UpdateMetadata($settings);
} else {
$object = $this->container->DataObject();
if (is_null($mtime)) {