From 464afb5ecac95124c55b6a8af38410732a76275c Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 5 Aug 2013 13:51:45 +0200
Subject: use isset to prevent undefined index

---
 lib/files/cache/scanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/files/cache')

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index dd212d84cc5..adecc2bb901 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -98,7 +98,7 @@ class Scanner extends BasicEmitter {
 				$newData = $data;
 				if ($reuseExisting and $cacheData = $this->cache->get($file)) {
 					// only reuse data if the file hasn't explicitly changed
-					if ($data['mtime'] === $cacheData['mtime']) {
+					if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) {
 						if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
 							$data['size'] = $cacheData['size'];
 						}
-- 
cgit v1.2.3


From f22719b1eed9a66dc8978bc81b4bf9778834ca4d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 12 Aug 2013 15:37:39 +0200
Subject: Scanner: correctly pass trough reuse options when doing a recursive
 scan

---
 lib/files/cache/scanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/files/cache')

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index adecc2bb901..597eabecf54 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -184,7 +184,7 @@ class Scanner extends BasicEmitter {
 			}
 			\OC_DB::commit();
 			foreach ($childQueue as $child) {
-				$childSize = $this->scanChildren($child, self::SCAN_RECURSIVE);
+				$childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse);
 				if ($childSize === -1) {
 					$size = -1;
 				} else {
-- 
cgit v1.2.3