From e25c1f313099c141abca1a09f7eda0ecdfde415d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 2 Apr 2013 16:25:12 +0200
Subject: [PATCH] port 22c8194cc8fde88957dbc8c6d9e253fac3c637bb

---
 core/ajax/update.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 31b8c0dbb6..6015a901eb 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -36,11 +36,15 @@ if (OC::checkUpgrade(false)) {
  * @param UpdateWatcher $watcher
  */
 function __doFileCacheUpgrade($watcher) {
-	$query = \OC_DB::prepare('
+	try {
+		$query = \OC_DB::prepare('
 		SELECT DISTINCT `user`
 		FROM `*PREFIX*fscache`
-	');
-	$result = $query->execute();
+		');
+		$result = $query->execute();
+	} catch (\Exception $e) {
+		return;
+	}
 	$users = $result->fetchAll();
 	if(count($users) == 0) {
 		return;