aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-12-30 20:27:38 -0500
committerMichael Gapczynski <mtgap@owncloud.com>2012-12-30 20:27:38 -0500
commit3ee3323b8766992a0b60bb76b909e49fc1ea76d2 (patch)
tree22ff7a51a3aa3945b9a7507a8bc9f25de0fd0bb6
parentd275725e233092f21247a62bde3e46a352d5a1b5 (diff)
downloadnextcloud-server-3ee3323b8766992a0b60bb76b909e49fc1ea76d2.tar.gz
nextcloud-server-3ee3323b8766992a0b60bb76b909e49fc1ea76d2.zip
Fix retrieving of cache and scanner in Updater class
-rw-r--r--lib/files/cache/updater.php18
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php
index fb9783023e8..c8c96a97eea 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -30,10 +30,12 @@ class Updater {
* @var string $internalPath
*/
list($storage, $internalPath) = self::resolvePath($path);
- $cache = new Cache($storage);
- $scanner = new Scanner($storage);
- $scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
- $cache->correctFolderSize($internalPath);
+ if ($storage) {
+ $cache = $storage->getCache();
+ $scanner = $storage->getScanner();
+ $scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
+ $cache->correctFolderSize($internalPath);
+ }
}
static public function deleteUpdate($path) {
@@ -42,9 +44,11 @@ class Updater {
* @var string $internalPath
*/
list($storage, $internalPath) = self::resolvePath($path);
- $cache = new Cache($storage);
- $cache->remove($internalPath);
- $cache->correctFolderSize($internalPath);
+ if ($storage) {
+ $cache = $storage->getCache();
+ $cache->remove($internalPath);
+ $cache->correctFolderSize($internalPath);
+ }
}
/**