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 cc665b5ec650807e71507d134631650414805950..b3014ed09f37066887aaa42a9669110cfe40f2b4 100644 (file)
--- 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 8a7c89976131dee1e0e5cd9c170dba9f31181e93..edda6c232616944aa226d56b5a2d23714a41b3b7 100644 (file)
--- 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 bb44d3f26473d49a4ac63167086a1fcb99332865..ddc83aa095ff04e35805ea0ef39b17d35b8ba1e1 100644 (file)
--- 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