diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-25 22:41:09 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-25 22:41:09 +0100 |
| commit | 1ae10b9da3280b9bb6fc3965d1ace43f1c0be56f (patch) | |
| tree | 6c5baf7e48fb399d7bf1b151b7cc40d5052113e2 /lib/private/files/cache/updater.php | |
| parent | bbc2e37259128ba12082e731bacdc740495ba2ea (diff) | |
| parent | eabeedb306849e3ec8916de5791a3951074a199f (diff) | |
| download | nextcloud-server-1ae10b9da3280b9bb6fc3965d1ace43f1c0be56f.tar.gz nextcloud-server-1ae10b9da3280b9bb6fc3965d1ace43f1c0be56f.zip | |
Merge pull request #7420 from owncloud/cachehooks-first
Manually triger the filecache update hooks before any other hook
Diffstat (limited to 'lib/private/files/cache/updater.php')
| -rw-r--r-- | lib/private/files/cache/updater.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php index 666d5dd7fe5..199ce5dee78 100644 --- a/lib/private/files/cache/updater.php +++ b/lib/private/files/cache/updater.php @@ -119,6 +119,9 @@ class Updater { if ($uid != \OCP\User::getUser()) { $info = \OC\Files\Filesystem::getFileInfo($filename); + if (!$info) { + return array($uid, '/files/' . $filename); + } $ownerView = new \OC\Files\View('/' . $uid . '/files'); $filename = $ownerView->getPath($info['fileid']); } @@ -150,7 +153,7 @@ class Updater { $cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath))); if ($realPath !== '') { $realPath = dirname($realPath); - if($realPath === DIRECTORY_SEPARATOR ) { + if ($realPath === DIRECTORY_SEPARATOR) { $realPath = ""; } // check storage for parent in case we change the storage in this step |