summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-01-19 16:35:07 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-01-19 16:35:07 +0100
commit4894a2c458f49b2c6b49b18cc0055ae087bff1b2 (patch)
tree0113a89510b305d3a33eeada80fab94590173843
parentc9db9523b16ccf300a7a093e8284750f3b92e95e (diff)
parent65041440de3a83a4337def0bd253e88d6d3e6017 (diff)
downloadnextcloud-server-4894a2c458f49b2c6b49b18cc0055ae087bff1b2.tar.gz
nextcloud-server-4894a2c458f49b2c6b49b18cc0055ae087bff1b2.zip
Merge pull request #13466 from owncloud/Undefined-index-mimetype-cache
check if mimetype is set - fixes #13452
-rw-r--r--lib/private/files/cache/cache.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 8d0681ba935..8831320bcee 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -588,7 +588,7 @@ class Cache {
if (is_null($entry) or !isset($entry['fileid'])) {
$entry = $this->get($path);
}
- if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
+ if (isset($entry['mimetype']) && $entry['mimetype'] === 'httpd/unix-directory') {
$id = $entry['fileid'];
$sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2, ' .
'SUM(`unencrypted_size`) AS f3 ' .