From 6f955defe46b498f014d4e0f105d26324bb7ecd6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Sep 2016 14:38:10 +0200
Subject: [PATCH] Return the autoupdater value from the server
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
lib/private/Updater/VersionCheck.php | 1 +
tests/lib/Updater/VersionCheckTest.php | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php
index e846052a300..d90990e2791 100644
--- a/lib/private/Updater/VersionCheck.php
+++ b/lib/private/Updater/VersionCheck.php
@@ -89,6 +89,7 @@ class VersionCheck {
$tmp['versionstring'] = (string)$data->versionstring;
$tmp['url'] = (string)$data->url;
$tmp['web'] = (string)$data->web;
+ $tmp['autoupdater'] = (string)$data->autoupdater;
} else {
libxml_clear_errors();
}
diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php
index d6b457da8a2..7e129232edd 100644
--- a/tests/lib/Updater/VersionCheckTest.php
+++ b/tests/lib/Updater/VersionCheckTest.php
@@ -83,6 +83,7 @@ class VersionCheckTest extends \Test\TestCase {
'versionstring' => 'ownCloud 8.0.4',
'url' => 'https://download.owncloud.org/community/owncloud-8.0.4.zip',
'web' => 'http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html',
+ 'autoupdater' => '0',
];
$this->config
@@ -120,6 +121,7 @@ class VersionCheckTest extends \Test\TestCase {
<versionstring>ownCloud 8.0.4</versionstring>
<url>https://download.owncloud.org/community/owncloud-8.0.4.zip</url>
<web>http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html</web>
+ <autoupdater>0</autoupdater>
</owncloud>';
$this->updater
->expects($this->once())
@@ -176,6 +178,7 @@ class VersionCheckTest extends \Test\TestCase {
'versionstring' => '',
'url' => '',
'web' => '',
+ 'autoupdater' => '',
];
$this->config
@@ -209,6 +212,7 @@ class VersionCheckTest extends \Test\TestCase {
<versionstring></versionstring>
<url></url>
<web></web>
+ <autoupdater></autoupdater>
</owncloud>';
$this->updater
->expects($this->once())
--
GitLab