From 3cbe40ffacfe2ab06cfbe7c81aeab947c30b6fb9 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 19 Jun 2018 16:26:06 +0200 Subject: If cronErros is empty json_decode will return NULL Fixes #9867 Signed-off-by: Roeland Jago Douma --- settings/Controller/CheckSetupController.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'settings/Controller') diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index f83d0966eda..ecbb9839c75 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -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 */ @@ -527,7 +537,7 @@ Raw output 'hasWorkingFileLocking' => $this->hasWorkingFileLocking(), 'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(), 'cronInfo' => $this->getLastCronInfo(), - 'cronErrors' => json_decode($this->config->getAppValue('core', 'cronErrors', ''), true), + 'cronErrors' => $this->getCronErrors(), 'serverHasInternetConnection' => $this->isInternetConnectionWorking(), 'isMemcacheConfigured' => $this->isMemcacheConfigured(), 'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'), -- cgit v1.2.3