mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17606 from owncloud/appstore-timeout 

Handle returned null value in app level code
This commit is contained in:
Morris Jobke 2015-07-14 08:57:37 +02:00
parent c601fb8181 533a23611a
commit eab1116924
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/controller/appsettingscontroller.php
View File

@ -173,7 +173,7 @@ class AppSettingsController extends Controller {
if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) { if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
$remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], \OC_Util::getVersion()); $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']; $apps[$key]['level'] = $remoteAppEntry['level'];
} }
} }
@ -189,7 +189,7 @@ class AppSettingsController extends Controller {
if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) { if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
$remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], \OC_Util::getVersion()); $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']; $apps[$key]['level'] = $remoteAppEntry['level'];
} }
} }