diff options
| -rw-r--r-- | apps/updatenotification/lib/Controller/AdminController.php | 2 | ||||
| -rw-r--r-- | apps/updatenotification/templates/admin.php | 2 | ||||
| -rw-r--r-- | lib/private/Updater/VersionCheck.php | 2 | ||||
| -rw-r--r-- | tests/lib/Updater/VersionCheckTest.php | 24 |
4 files changed, 15 insertions, 15 deletions
diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php index ebb3fa642f1..9f10f1b32f2 100644 --- a/apps/updatenotification/lib/Controller/AdminController.php +++ b/apps/updatenotification/lib/Controller/AdminController.php @@ -128,7 +128,7 @@ class AdminController extends Controller implements ISettings { public function setChannel($channel) { \OCP\Util::setChannel($channel); $this->config->setAppValue('core', 'lastupdatedat', 0); - return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Updated channel')]]); + return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]); } /** diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php index 3c3d6cbd4cd..68ef1d423b4 100644 --- a/apps/updatenotification/templates/admin.php +++ b/apps/updatenotification/templates/admin.php @@ -32,7 +32,7 @@ </option> <?php } ?> </select> - <span id="channel_save_msg"></span> + <span id="channel_save_msg" class="msg"></span> </p> <p> <em><?php p($l->t('You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel.')); ?></em> diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index 6f6508d314c..88ba9b63fa3 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -59,7 +59,7 @@ class VersionCheck { return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true); } - $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.owncloud.com/server/'); + $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/server/'); $this->config->setAppValue('core', 'lastupdatedat', time()); diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php index 5283ca9c555..e39c9362a14 100644 --- a/tests/lib/Updater/VersionCheckTest.php +++ b/tests/lib/Updater/VersionCheckTest.php @@ -91,8 +91,8 @@ class VersionCheckTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.owncloud.com/server/') - ->willReturn('https://updates.owncloud.com/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/server/') + ->willReturn('https://updates.nextcloud.com/server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -122,7 +122,7 @@ class VersionCheckTest extends \Test\TestCase { $this->updater ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/server/')) ->will($this->returnValue($updateXml)); $this->assertSame($expectedResult, $this->updater->check()); @@ -137,8 +137,8 @@ class VersionCheckTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.owncloud.com/server/') - ->willReturn('https://updates.owncloud.com/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/server/') + ->willReturn('https://updates.nextcloud.com/server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -162,7 +162,7 @@ class VersionCheckTest extends \Test\TestCase { $this->updater ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/server/')) ->will($this->returnValue($updateXml)); $this->assertSame([], $this->updater->check()); @@ -184,8 +184,8 @@ class VersionCheckTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.owncloud.com/server/') - ->willReturn('https://updates.owncloud.com/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/server/') + ->willReturn('https://updates.nextcloud.com/server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -211,7 +211,7 @@ class VersionCheckTest extends \Test\TestCase { $this->updater ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/server/')) ->will($this->returnValue($updateXml)); $this->assertSame($expectedResult, $this->updater->check()); @@ -228,8 +228,8 @@ class VersionCheckTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.owncloud.com/server/') - ->willReturn('https://updates.owncloud.com/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/server/') + ->willReturn('https://updates.nextcloud.com/server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -253,7 +253,7 @@ class VersionCheckTest extends \Test\TestCase { $this->updater ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/server/')) ->will($this->returnValue($updateXml)); $this->assertSame($expectedResult, $this->updater->check()); |