summaryrefslogtreecommitdiffstats
path: root/lib/files
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-12 11:01:14 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-12 11:01:14 +0100
commita953786d7952f2d758a8111302822708d906875e (patch)
tree167704bb6ad7debce5a38c46e795efb22aff63ea /lib/files
parent646d60ee83168169050271ee9d5442e2dc626e8a (diff)
parent2507e0da1d61af5d9a9506a29aa6df4c31ac068e (diff)
downloadnextcloud-server-a953786d7952f2d758a8111302822708d906875e.tar.gz
nextcloud-server-a953786d7952f2d758a8111302822708d906875e.zip
Merge branch 'master' into external_storage_ui_feedback
Diffstat (limited to 'lib/files')
-rw-r--r--lib/files/cache/legacy.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
index 33d4b8e7c9f..6d1ffa7b40b 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/files/cache/legacy.php
@@ -51,6 +51,12 @@ class Legacy {
$this->cacheHasItems = false;
return false;
}
+
+ if ($result === false || property_exists($result, 'error_message_prefix')) {
+ $this->cacheHasItems = false;
+ return false;
+ }
+
$this->cacheHasItems = (bool)$result->fetchRow();
return $this->cacheHasItems;
}