diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-13 01:18:01 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-13 01:18:01 +0100 |
| commit | bc43dd704fc89188faadb42d313a41f8b2929c0c (patch) | |
| tree | e3d55e4b2cff99d4bdae91475a7249381c846ba9 /lib/files/cache/legacy.php | |
| parent | 14e3d77d64a83704d224ca91b5736ec2e94ee01b (diff) | |
| parent | 68fa0b7dcc4a45e4f44b754626440091608ccc85 (diff) | |
| download | nextcloud-server-bc43dd704fc89188faadb42d313a41f8b2929c0c.tar.gz nextcloud-server-bc43dd704fc89188faadb42d313a41f8b2929c0c.zip | |
Merge branch 'master' into fixing-1424-master
Conflicts:
settings/js/users.js
Diffstat (limited to 'lib/files/cache/legacy.php')
| -rw-r--r-- | lib/files/cache/legacy.php | 6 |
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; } |