From 9bbfeada6bb99efdd22514b3a9793a723dfa2564 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Oct 2014 17:06:37 +0200
Subject: [PATCH] Only try to scan the children of directories

---
 lib/private/files/cache/scanner.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index c30487fbfe..8f38d68d25 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -232,8 +232,8 @@ class Scanner extends BasicEmitter {
 			$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 @@ class Scanner extends BasicEmitter {
 	 */
 	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)) {