From 4be039e6cbc0a826b07fc2af1a6c6d94888a9187 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 15 Dec 2012 03:10:56 +0100
Subject: Filecache Watcher: use scan or scanFile based on the current item,
 not the cached item

---
 lib/files/cache/watcher.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/files/cache')

diff --git a/lib/files/cache/watcher.php b/lib/files/cache/watcher.php
index d6039d9945c..31059ec7f56 100644
--- a/lib/files/cache/watcher.php
+++ b/lib/files/cache/watcher.php
@@ -44,12 +44,14 @@ class Watcher {
 	public function checkUpdate($path) {
 		$cachedEntry = $this->cache->get($path);
 		if ($this->storage->hasUpdated($path, $cachedEntry['mtime'])) {
-			if ($cachedEntry['mimetype'] === 'httpd/unix-directory') {
+			if ($this->storage->is_dir($path)) {
 				$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
-				$this->cleanFolder($path);
 			} else {
 				$this->scanner->scanFile($path);
 			}
+			if ($cachedEntry['mimetype'] === 'httpd/unix-directory') {
+				$this->cleanFolder($path);
+			}
 			$this->cache->correctFolderSize($path);
 		}
 	}
-- 
cgit v1.2.3