diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-07-14 11:44:06 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-07-14 11:44:06 +0200 |
| commit | ab308d246a949a8a816ce8226bd14e8f15fe3b49 (patch) | |
| tree | 6c7f8f9860649033362ee7b78fb82eedd629d62e | |
| parent | 698e2ebc908f2367c09025e59af5aa1b1251639f (diff) | |
| parent | dc9454ea3cb23aa9472a3a5bd334bfeeefdcb624 (diff) | |
| download | nextcloud-server-ab308d246a949a8a816ce8226bd14e8f15fe3b49.tar.gz nextcloud-server-ab308d246a949a8a816ce8226bd14e8f15fe3b49.zip | |
Merge pull request #17632 from owncloud/stable8.1-backport-17606
[stable8.1] Handle returned null value in app level code
| -rw-r--r-- | settings/controller/appsettingscontroller.php | 4 |
1 files 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']; } } |