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

Add a try catch block

Browse source 
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
This commit is contained in:
Lukas Reschke 2014-10-16 21:45:09 +02:00
parent 1ebeb6792e
commit 53e0cf2f74
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 return $versions; // when function is used besides in checkUpgrade
} }
$versions = array(); $versions = array();
$query = OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig`' try {
. ' WHERE `configkey` = \'installed_version\''); $query = OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig`'
$result = $query->execute(); . ' WHERE `configkey` = \'installed_version\'');
while ($row = $result->fetchRow()) { $result = $query->execute();
$versions[$row['appid']] = $row['configvalue']; while ($row = $result->fetchRow()) {
$versions[$row['appid']] = $row['configvalue'];
}
return $versions;
} catch (\Exception $e) {
return array();
} }
return $versions;
} }