From 3ee3323b8766992a0b60bb76b909e49fc1ea76d2 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 30 Dec 2012 20:27:38 -0500
Subject: Fix retrieving of cache and scanner in Updater class

---
 lib/files/cache/updater.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'lib/files/cache/updater.php')

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);
+		}
 	}
 
 	/**
-- 
cgit v1.2.3