Merge branch 'filesystem' into filesystem-etags

Conflicts:
	lib/files/cache/updater.php

lib/files/cache/updater.php

@@ -30,12 +30,14 @@ class Updater {
 		 * @var string $internalPath
 		 */
 		list($storage, $internalPath) = self::resolvePath($path);
-		$cache = new Cache($storage);
-		$scanner = new Scanner($storage);
+		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,11 +45,13 @@ class Updater {
 		 * @var string $internalPath
 		 */
 		list($storage, $internalPath) = self::resolvePath($path);
-		$cache = new Cache($storage);
+		if ($storage) {
+			$cache = $storage->getCache();
 			$cache->remove($internalPath);
 			$cache->correctFolderSize($internalPath);
 			self::eTagUpdate($path);
 		}
+	}
 
 	static public function eTagUpdate($path) {
 		if ($path !== '') {