Browse Source
Merge pull request #8136 from nextcloud/use-correct-update-server
Use correct update server
pull/8094/merge
Morris Jobke
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
apps/updatenotification/lib/Settings/Admin.php
-
apps/updatenotification/tests/Settings/AdminTest.php
|
|
|
@ -77,7 +77,7 @@ class Admin implements ISettings { |
|
|
|
|
|
|
|
$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true); |
|
|
|
|
|
|
|
$defaultUpdateServerURL = 'https://updates.nextcloud.com/server/'; |
|
|
|
$defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/'; |
|
|
|
$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL); |
|
|
|
|
|
|
|
$params = [ |
|
|
|
|
|
|
|
@ -81,8 +81,8 @@ class AdminTest extends TestCase { |
|
|
|
$this->config |
|
|
|
->expects($this->once()) |
|
|
|
->method('getSystemValue') |
|
|
|
->with('updater.server.url', 'https://updates.nextcloud.com/server/') |
|
|
|
->willReturn('https://updates.nextcloud.com/server/'); |
|
|
|
->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/') |
|
|
|
->willReturn('https://updates.nextcloud.com/updater_server/'); |
|
|
|
$this->dateTimeFormatter |
|
|
|
->expects($this->once()) |
|
|
|
->method('formatDateTime') |
|
|
|
@ -108,7 +108,7 @@ class AdminTest extends TestCase { |
|
|
|
'downloadLink' => 'https://downloads.nextcloud.org/server', |
|
|
|
'updaterEnabled' => true, |
|
|
|
'isDefaultUpdateServerURL' => true, |
|
|
|
'updateServerURL' => 'https://updates.nextcloud.com/server/', |
|
|
|
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/', |
|
|
|
'notify_groups' => 'admin', |
|
|
|
]; |
|
|
|
|
|
|
|
|
