From 9a25f7b849e52d19a8aab8e377ef10625a461e42 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 May 2013 10:40:05 -0400
Subject: [PATCH] Organize conditionals in a better order

---
 lib/files/cache/scanner.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index f58cd492c8c..463fe924f20 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -77,19 +77,15 @@ class Scanner {
 						$this->scanFile($parent);
 					}
 				}
+				$newData = $data;
 				if ($cacheData = $this->cache->get($file)) {
+					if ($checkExisting && $data['size'] === -1) {
+						$data['size'] = $cacheData['size'];
+					}
 					if ($data['mtime'] === $cacheData['mtime'] &&
 						$data['size'] === $cacheData['size']) {
 						$data['etag'] = $cacheData['etag'];
 					}
-				}
-				if ($checkExisting and $cacheData) {
-					if ($data['size'] === -1) {
-						$data['size'] = $cacheData['size'];
-					}
-				}
-				$newData = $data;
-				if ($cacheData) {
 					// Only update metadata that has changed
 					$newData = array_diff($data, $cacheData);
 				}
-- 
2.39.5