Merge branch 'filesystem' into filesystem-etags

Conflicts:
	lib/files/cache/updater.php

1 files changed, 13 insertions, 9 deletions

diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php
index 7fc9bd382fe..26041590091 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -30,11 +30,13 @@ 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);
-		self::eTagUpdate($path);
+		if ($storage) {
+			$cache = $storage->getCache();
+			$scanner = $storage->getScanner();
+			$scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
+			$cache->correctFolderSize($internalPath);
+			self::eTagUpdate($path);
+		}
 	}
 
 	static public function deleteUpdate($path) {
@@ -43,10 +45,12 @@ class Updater {
 		 * @var string $internalPath
 		 */
 		list($storage, $internalPath) = self::resolvePath($path);
-		$cache = new Cache($storage);
-		$cache->remove($internalPath);
-		$cache->correctFolderSize($internalPath);
-		self::eTagUpdate($path);
+		if ($storage) {
+			$cache = $storage->getCache();
+			$cache->remove($internalPath);
+			$cache->correctFolderSize($internalPath);
+			self::eTagUpdate($path);
+		}
 	}
 
 	static public function eTagUpdate($path) {