Merge pull request #1555 from nextcloud/updatestate-can-be-empty-stable10

[stable10] UpdateState is empty if no update is available
This commit is contained in:
Lukas Reschke 2016-09-28 13:03:22 +02:00 committed by GitHub
commit 51249f7dde
2 changed files with 2 additions and 2 deletions

View File

@ -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),
];

View File

@ -161,7 +161,7 @@ class AdminControllerTest extends TestCase {
$this->updateChecker
->expects($this->once())
->method('getUpdateState')
->willReturn(['updaterEnabled' => false]);
->willReturn([]);
$params = [
'isNewVersionAvailable' => false,