upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 06:08:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Organize conditionals in a better order

Browse source
This commit is contained in:
Michael Gapczynski 2013-05-29 10:40:05 -04:00
parent 04805d0be9
commit ea55367678
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/files/cache/scanner.php vendored
View file

@ -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);
}