From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 29 Nov 2016 10:28:04 +0000 (+0100)
Subject: Use correct channel information
X-Git-Tag: v11.0RC2~102^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F2396%2Fhead;p=nextcloud-server.git

Use correct channel information

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index cc665b5ec65..b3014ed09f3 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -428,13 +428,7 @@ class OC_Util {
 	 */
 	public static function getChannel() {
 		OC_Util::loadVersion();
-
-		// Allow overriding update channel
-		if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			self::$versionCache['OC_Channel'] = \OC::$server->getAppConfig()->getValue('core', 'OC_Channel');
-		}
-
-		return self::$versionCache['OC_Channel'];
+		return \OC::$server->getConfig()->getSystemValue('updater.release.channel', self::$versionCache['OC_Channel']);
 	}
 
 	/**
diff --git a/lib/public/Util.php b/lib/public/Util.php
index 8a7c8997613..edda6c23261 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -82,8 +82,6 @@ class Util {
 	 * @since 8.1.0
 	 */
 	public static function setChannel($channel) {
-		//Flush timestamp to reload version.php
-		\OC::$server->getAppConfig()->setValue('core', 'OC_Channel', $channel);
 		\OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel);
 	}
 	
diff --git a/version.php b/version.php
index bb44d3f2647..ddc83aa095f 100644
--- a/version.php
+++ b/version.php
@@ -33,7 +33,7 @@ $OC_VersionString = '11.0 beta 2';
 
 $OC_VersionCanBeUpgradedFrom = array(9, 1);
 
-// The ownCloud channel
+// default Nextcloud channel
 $OC_Channel = 'git';
 
 // The build number