Only try to scan the children of directories

owncloud · Feb 11, 2015 · 9bbfead · 9bbfead
1 parent dc6468c
commit 9bbfead
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
@@ -232,8 +232,8 @@ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
 			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG;
 		}
 		$data = $this->scanFile($path, $reuse);
-		if ($data !== null) {
-			$size = $this->scanChildren($path, $recursive, $reuse);
+		if ($data and $data['mimetype'] === 'httpd/unix-directory') {
+			$size = $this->scanChildren($path, $recursive, $reuse, $data);
 			$data['size'] = $size;
 		}
 		return $data;
@@ -262,7 +262,7 @@ protected function getExistingChildren($folderId) {
 	 */
 	protected function getNewChildren($folder) {
 		$children = array();
-		if ($this->storage->is_dir($folder) && ($dh = $this->storage->opendir($folder))) {
+		if ($dh = $this->storage->opendir($folder)) {
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 					if (!Filesystem::isIgnoredDir($file)) {