From 533a23611a09d83baa0e909db30a68f9edae3183 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 13 Jul 2015 14:28:14 +0200
Subject: [PATCH] Handle returned null value in app level code
* getApplication on OCSClient can also return null
this is now handled properly
* fixes #17587
---
settings/controller/appsettingscontroller.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
index 6803985d5db..f5cb043da20 100644
--- a/settings/controller/appsettingscontroller.php
+++ b/settings/controller/appsettingscontroller.php
@@ -173,7 +173,7 @@ class AppSettingsController extends Controller {
if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
$remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], \OC_Util::getVersion());
- if(array_key_exists('level', $remoteAppEntry)) {
+ if(is_array($remoteAppEntry) && array_key_exists('level', $remoteAppEntry)) {
$apps[$key]['level'] = $remoteAppEntry['level'];
}
}
@@ -189,7 +189,7 @@ class AppSettingsController extends Controller {
if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
$remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], \OC_Util::getVersion());
- if(array_key_exists('level', $remoteAppEntry)) {
+ if(is_array($remoteAppEntry) && array_key_exists('level', $remoteAppEntry)) {
$apps[$key]['level'] = $remoteAppEntry['level'];
}
}
--
GitLab