diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-11-29 12:39:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 12:39:50 +0100 |
| commit | 57b00a18227596ab1afd7986e2272a66eda1b9e7 (patch) | |
| tree | 44301fcbc789555a350e185f227ed18dec6cea61 | |
| parent | e8ea9a5d276369c83d98ba4efe9bc969d06a9148 (diff) | |
| parent | 734dd3a2e638ed2be9b149bb2d28fbbc21fb81e8 (diff) | |
| download | nextcloud-server-57b00a18227596ab1afd7986e2272a66eda1b9e7.tar.gz nextcloud-server-57b00a18227596ab1afd7986e2272a66eda1b9e7.zip | |
Merge pull request #2396 from nextcloud/use-correct-channel
Use correct channel information
| -rw-r--r-- | lib/private/legacy/util.php | 8 | ||||
| -rw-r--r-- | lib/public/Util.php | 2 | ||||
| -rw-r--r-- | version.php | 2 |
3 files changed, 2 insertions, 10 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']); } /** 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 |