diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
commit | 27fcdb3af5d1b1012695a09e04c0a654a1dde710 (patch) | |
tree | 6de492454c862852de3f51bd8834e2012139b5ac /lib/files/cache/legacy.php | |
parent | 46e5e9bd73a68f7b50bb79f883a8bc6efacaca97 (diff) | |
parent | 3584d48d65900b15dc3ef6831926f4a52e508625 (diff) | |
download | nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.tar.gz nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.zip |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'lib/files/cache/legacy.php')
-rw-r--r-- | lib/files/cache/legacy.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php index b8e2548639b..ab8ae6dfadd 100644 --- a/lib/files/cache/legacy.php +++ b/lib/files/cache/legacy.php @@ -45,7 +45,7 @@ class Legacy { return $this->cacheHasItems; } try { - $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `user` = ? LIMIT 1'); + $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `user` = ?',1); } catch (\Exception $e) { $this->cacheHasItems = false; return false; |