wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Add a try catch block
This commit is contained in:
Vincent Petry 2014-10-16 22:27:08 +02:00
commit 0412f83035
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/app.php
View file

@ -1101,13 +1101,17 @@ class OC_App {
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;
}