From 53e0cf2f74af236f6121b5aedfd1e06d93902674 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 16 Oct 2014 21:45:09 +0200 Subject: [PATCH] Add a try catch block 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. --- lib/private/app.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/private/app.php b/lib/private/app.php index 95a8a7302d..faaadef385 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -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; }