summaryrefslogtreecommitdiffstats
path: root/lib/private/App
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-03-28 11:12:56 +0200
committerJulius Härtl <jus@bitgrid.net>2018-03-28 11:12:56 +0200
commiteb6e5a27a34060b7e410fd8013ce12134cda7f68 (patch)
treee23abc19471cb3004e890fafe19c53a323bc9061 /lib/private/App
parent2124ebae72409d6d9da7221a558cddacb3145d74 (diff)
downloadnextcloud-server-eb6e5a27a34060b7e410fd8013ce12134cda7f68.tar.gz
nextcloud-server-eb6e5a27a34060b7e410fd8013ce12134cda7f68.zip
Do not fail hard if no appinfo is returned during update
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/App')
-rw-r--r--lib/private/App/AppManager.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 442fc1a0e1b..4d0859b1988 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -358,7 +358,7 @@ class AppManager implements IAppManager {
*
* @param bool $path
* @param null $lang
- * @return array app info
+ * @return array|null app info
*/
public function getAppInfo(string $appId, bool $path = false, $lang = null) {
if ($path) {
@@ -411,7 +411,9 @@ class AppManager implements IAppManager {
$incompatibleApps = array();
foreach ($apps as $appId) {
$info = $this->getAppInfo($appId);
- if (!\OC_App::isAppCompatible($version, $info)) {
+ if ($info === null) {
+ $incompatibleApps[] = ['id' => $appId];
+ } else if (!\OC_App::isAppCompatible($version, $info)) {
$incompatibleApps[] = $info;
}
}