summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-29 11:28:04 +0100
committerMorris Jobke <hey@morrisjobke.de>2016-11-29 11:29:43 +0100
commit734dd3a2e638ed2be9b149bb2d28fbbc21fb81e8 (patch)
tree44301fcbc789555a350e185f227ed18dec6cea61 /lib/private
parente8ea9a5d276369c83d98ba4efe9bc969d06a9148 (diff)
downloadnextcloud-server-734dd3a2e638ed2be9b149bb2d28fbbc21fb81e8.tar.gz
nextcloud-server-734dd3a2e638ed2be9b149bb2d28fbbc21fb81e8.zip
Use correct channel information
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/legacy/util.php8
1 files changed, 1 insertions, 7 deletions
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']);
}
/**