Merge pull request #11625 from owncloud/fix-setup-due-to-some-race-co…

…ndition Add a try catch block
owncloud · Oct 16, 2014 · 0412f83 · 0412f83
2 parents 1ebeb67 + 53e0cf2
commit 0412f83
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/lib/private/app.php b/lib/private/app.php
@@ -1101,13 +1101,17 @@ public static function getAppVersions() {
 			return $versions; // when function is used besides in checkUpgrade
 		}
 		$versions = array();
-		$query = OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig`'
-			. ' WHERE `configkey` = \'installed_version\'');
-		$result = $query->execute();
-		while ($row = $result->fetchRow()) {
-			$versions[$row['appid']] = $row['configvalue'];
+		try {
+			$query = OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig`'
+				. ' WHERE `configkey` = \'installed_version\'');
+			$result = $query->execute();
+			while ($row = $result->fetchRow()) {
+				$versions[$row['appid']] = $row['configvalue'];
+			}
+			return $versions;
+		} catch (\Exception $e) {
+			return array();
 		}
-		return $versions;
 	}