From 1602e82363a8e33a982b6b258e0184d9f2afc839 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 28 Sep 2016 12:29:02 +0200 Subject: [PATCH] UpdateState is empty if no update is available This leads to log messages such as "Undefined index: updaterEnabled at /media/psf/nextcloud/apps/updatenotification/lib/Controller/AdminController.php#116". Signed-off-by: Lukas Reschke --- apps/updatenotification/lib/Controller/AdminController.php | 2 +- .../updatenotification/tests/Controller/AdminControllerTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php index 56f41ebf3e..0a867f1267 100644 --- a/apps/updatenotification/lib/Controller/AdminController.php +++ b/apps/updatenotification/lib/Controller/AdminController.php @@ -113,7 +113,7 @@ class AdminController extends Controller implements ISettings { 'channels' => $channels, 'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'], 'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'], - 'updaterEnabled' => $updateState['updaterEnabled'], + 'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'], 'notify_groups' => implode('|', $notifyGroups), ]; diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php index 2360663e1c..31e852a9e2 100644 --- a/apps/updatenotification/tests/Controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php @@ -162,7 +162,7 @@ class AdminControllerTest extends TestCase { $this->updateChecker ->expects($this->once()) ->method('getUpdateState') - ->willReturn(['updaterEnabled' => false]); + ->willReturn([]); $params = [ 'isNewVersionAvailable' => false,