backport: Updater: pass update url as argument to update check

Conflicts:
	lib/updater.php

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/updater.php b/lib/updater.php
index b0bc026167b..a167ac0ef04 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -37,9 +37,10 @@ class Updater extends BasicEmitter {
 
 	/**
 	 * Check if a new version is available
+	 * @param string $updateUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
 	 * @return array | bool
 	 */
-	public function check() {
+	public function check($updaterUrl) {
 		OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
 		if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
 			return json_decode(\OC_Appconfig::getValue('core', 'lastupdateResult'), true);
@@ -47,17 +48,16 @@ class Updater extends BasicEmitter {
 		if (\OC_Appconfig::getValue('core', 'installedat', '') == '') {
 			\OC_Appconfig::setValue('core', 'installedat', microtime(true));
 		}
-
-		$updaterurl = 'http://apps.owncloud.com/updater.php';
+;
 		$version = \OC_Util::getVersion();
 		$version['installed'] = \OC_Appconfig::getValue('core', 'installedat');
 		$version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat');
 		$version['updatechannel'] = 'stable';
 		$version['edition'] = \OC_Util::getEditionString();
-		$versionstring = implode('x', $version);
+		$versionString = implode('x', $version);
 
 		//fetch xml data from updater
-		$url = $updaterurl . '?version=' . $versionstring;
+		$url = $updaterUrl . '?version=' . $versionString;
 
 		// set a sensible timeout of 10 sec to stay responsive even if the update server is down.
 		$ctx = stream_context_create(