From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 May 2013 14:40:05 +0000 (-0400)
Subject: Organize conditionals in a better order
X-Git-Tag: v6.0.0alpha2~713^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea553676789a4b62c1850dc156552ba8276fde5f;p=nextcloud-server.git

Organize conditionals in a better order
---

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index cd022d25132..8f9a7921956 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -78,19 +78,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);
 				}