diff options
Diffstat (limited to 'lib/private/Files/Cache/Cache.php')
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index dc2ba78457e..7c2e635549a 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -151,7 +151,7 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->selectFileCache(); - if (is_string($file) or $file == '') { + if (is_string($file) || $file == '') { // normalize file $file = $this->normalize($file); @@ -166,7 +166,7 @@ class Cache implements ICache { $result->closeCursor(); //merge partial data - if (!$data and is_string($file) and isset($this->partial[$file])) { + if (!$data && is_string($file) && isset($this->partial[$file])) { return $this->partial[$file]; } elseif (!$data) { return $data; @@ -819,7 +819,7 @@ class Cache implements ICache { $this->calculateFolderSize($path, $data); if ($path !== '') { $parent = dirname($path); - if ($parent === '.' or $parent === '/') { + if ($parent === '.' || $parent === '/') { $parent = ''; } if ($isBackgroundScan) { @@ -865,7 +865,7 @@ class Cache implements ICache { */ public function calculateFolderSize($path, $entry = null) { $totalSize = 0; - if (is_null($entry) or !isset($entry['fileid'])) { + if (is_null($entry) || !isset($entry['fileid'])) { $entry = $this->get($path); } if (isset($entry['mimetype']) && $entry['mimetype'] === FileInfo::MIMETYPE_FOLDER) { |