summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-02-11 15:31:28 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2013-02-11 15:31:28 -0800
commit53111ccdc835052480fef2fa0ab65ba4850fd36f (patch)
treea5ed2c08e95b899766b06d747ae3f9359a86c98d /lib
parentfb23ac3ce2e0b3f002f036e55e516b672f088dc0 (diff)
parent062befd1fc90b6c9b6ac835a3d4babce6d8f8c81 (diff)
downloadnextcloud-server-53111ccdc835052480fef2fa0ab65ba4850fd36f.tar.gz
nextcloud-server-53111ccdc835052480fef2fa0ab65ba4850fd36f.zip
Merge pull request #1634 from irgsmirx/patch-6
Update/Bugfix lib/files/cache/legacy.php during database upgrade
Diffstat (limited to 'lib')
-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;
}