From ea553676789a4b62c1850dc156552ba8276fde5f 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 cd022d2513..8f9a792195 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);
}
--
GitLab