wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If cronErros is empty json_decode will return NULL

Browse source 
Fixes #9867

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-06-19 16:26:06 +02:00
parent c3aea9cdf6
commit 3cbe40ffac
No known key found for this signature in database
GPG key ID: F941078878347C0C
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
settings/Controller/CheckSetupController.php
View file

@ -513,6 +513,16 @@ Raw output
]; ];
} }
protected function getCronErrors() {
$errors = json_decode($this->config->getAppValue('core', 'cronErrors', ''), true);
if (is_array($errors)) {
return $errors;
}
return [];
}
/** /**
* @return DataResponse * @return DataResponse
*/ */
@ -527,7 +537,7 @@ Raw output
'hasWorkingFileLocking' => $this->hasWorkingFileLocking(), 'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(), 'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
'cronInfo' => $this->getLastCronInfo(), 'cronInfo' => $this->getLastCronInfo(),
'cronErrors' => json_decode($this->config->getAppValue('core', 'cronErrors', ''), true), 'cronErrors' => $this->getCronErrors(),
'serverHasInternetConnection' => $this->isInternetConnectionWorking(), 'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
'isMemcacheConfigured' => $this->isMemcacheConfigured(), 'isMemcacheConfigured' => $this->isMemcacheConfigured(),
'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'), 'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),