diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-14 12:49:33 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-14 12:49:33 +0200 |
| commit | 28d6da815816b01c87dfc857dd6ca16c7cd6ead9 (patch) | |
| tree | 01190708e78cf7fa8ce77e00d9fa0e9eed07416b | |
| parent | b090ed7666cb56b88f094ebb910641646d118c1c (diff) | |
| parent | 02513f8d040fd081a308f80c887f91b86bcc2a70 (diff) | |
| download | nextcloud-server-28d6da815816b01c87dfc857dd6ca16c7cd6ead9.tar.gz nextcloud-server-28d6da815816b01c87dfc857dd6ca16c7cd6ead9.zip | |
Merge pull request #19738 from owncloud/proppatch-lastmodified
Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
| -rw-r--r-- | lib/private/connector/sabre/filesplugin.php | 6 | ||||
| -rw-r--r-- | tests/lib/connector/sabre/filesplugin.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php index ab7f6884a5e..38a7139d9e9 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -41,7 +41,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin { const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL'; const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size'; const GETETAG_PROPERTYNAME = '{DAV:}getetag'; - const GETLASTMODIFIED_PROPERTYNAME = '{DAV:}getlastmodified'; + const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified'; /** * Reference to main server object @@ -101,7 +101,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin { $server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME; // normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH - $allowedProperties = ['{DAV:}getetag', '{DAV:}getlastmodified']; + $allowedProperties = ['{DAV:}getetag']; $server->protectedProperties = array_diff($server->protectedProperties, $allowedProperties); $this->server = $server; @@ -208,7 +208,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin { * @return void */ public function handleUpdateProperties($path, PropPatch $propPatch) { - $propPatch->handle(self::GETLASTMODIFIED_PROPERTYNAME, function($time) use ($path) { + $propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function($time) use ($path) { if (empty($time)) { return false; } diff --git a/tests/lib/connector/sabre/filesplugin.php b/tests/lib/connector/sabre/filesplugin.php index 0aa62cab176..391062d6796 100644 --- a/tests/lib/connector/sabre/filesplugin.php +++ b/tests/lib/connector/sabre/filesplugin.php @@ -13,7 +13,7 @@ class FilesPlugin extends \Test\TestCase { const FILEID_PROPERTYNAME = \OC\Connector\Sabre\FilesPlugin::FILEID_PROPERTYNAME; const SIZE_PROPERTYNAME = \OC\Connector\Sabre\FilesPlugin::SIZE_PROPERTYNAME; const PERMISSIONS_PROPERTYNAME = \OC\Connector\Sabre\FilesPlugin::PERMISSIONS_PROPERTYNAME; - const GETLASTMODIFIED_PROPERTYNAME = \OC\Connector\Sabre\FilesPlugin::GETLASTMODIFIED_PROPERTYNAME; + const LASTMODIFIED_PROPERTYNAME = \OC\Connector\Sabre\FilesPlugin::LASTMODIFIED_PROPERTYNAME; const DOWNLOADURL_PROPERTYNAME = \OC\Connector\Sabre\FilesPlugin::DOWNLOADURL_PROPERTYNAME; /** @@ -190,7 +190,7 @@ class FilesPlugin extends \Test\TestCase { // properties to set $propPatch = new \Sabre\DAV\PropPatch(array( self::GETETAG_PROPERTYNAME => 'newetag', - self::GETLASTMODIFIED_PROPERTYNAME => $testDate + self::LASTMODIFIED_PROPERTYNAME => $testDate )); $this->plugin->handleUpdateProperties( @@ -203,7 +203,7 @@ class FilesPlugin extends \Test\TestCase { $this->assertEmpty($propPatch->getRemainingMutations()); $result = $propPatch->getResult(); - $this->assertEquals(200, $result[self::GETLASTMODIFIED_PROPERTYNAME]); + $this->assertEquals(200, $result[self::LASTMODIFIED_PROPERTYNAME]); $this->assertEquals(200, $result[self::GETETAG_PROPERTYNAME]); } |