diff options
Diffstat (limited to 'apps/dav')
-rw-r--r-- | apps/dav/lib/Connector/Sabre/File.php | 8 | ||||
-rw-r--r-- | apps/dav/lib/Connector/Sabre/Node.php | 4 | ||||
-rw-r--r-- | apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index f2c69eccff9..d0826ee5a8c 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -203,10 +203,6 @@ class File extends Node implements IFile { throw new FileLocked($e->getMessage(), $e->getCode(), $e); } - if ($view) { - $this->emitPostHooks($exists); - } - // allow sync clients to send the mtime along in a header $request = \OC::$server->getRequest(); if (isset($request->server['HTTP_X_OC_MTIME'])) { @@ -214,6 +210,10 @@ class File extends Node implements IFile { header('X-OC-MTime: accepted'); } } + + if ($view) { + $this->emitPostHooks($exists); + } $this->refreshInfo(); diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php index a63282c75e2..3e2204cf661 100644 --- a/apps/dav/lib/Connector/Sabre/Node.php +++ b/apps/dav/lib/Connector/Sabre/Node.php @@ -250,8 +250,8 @@ abstract class Node implements \Sabre\DAV\INode { $path = $this->info->getInternalPath(); - if ($storage->instanceOfStorage('\OC\Files\Storage\Shared')) { - /** @var \OC\Files\Storage\Shared $storage */ + if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) { + /** @var \OCA\Files_Sharing\SharedStorage $storage */ $permissions = (int)$storage->getShare()->getPermissions(); } else { $permissions = $storage->getPermissions($path); diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php index fedf76f7929..18f91bbd8c9 100644 --- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php @@ -216,7 +216,7 @@ class DirectoryTest extends \Test\TestCase { $storage->expects($this->any()) ->method('instanceOfStorage') ->will($this->returnValueMap([ - '\OC\Files\Storage\Shared' => false, + '\OCA\Files_Sharing\SharedStorage' => false, '\OC\Files\Storage\Wrapper\Quota' => false, ])); @@ -247,7 +247,7 @@ class DirectoryTest extends \Test\TestCase { $storage->expects($this->any()) ->method('instanceOfStorage') ->will($this->returnValueMap([ - ['\OC\Files\Storage\Shared', false], + ['\OCA\Files_Sharing\SharedStorage', false], ['\OC\Files\Storage\Wrapper\Quota', true], ])); |