mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8136 from nextcloud/use-correct-update-server 

Use correct update server
This commit is contained in:
Morris Jobke 2018-02-01 14:40:44 +01:00 committed by GitHub
parent c176a7a78b 4739076474
commit e28c40788f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/updatenotification/lib/Settings/Admin.php
View File

@ -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 = [

6
apps/updatenotification/tests/Settings/AdminTest.php
View File

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