mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use correct channel information 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2016-11-29 11:28:04 +01:00
parent e8ea9a5d27
commit 734dd3a2e6
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/legacy/util.php
View File

@ -428,13 +428,7 @@ class OC_Util {
*/ */
public static function getChannel() { public static function getChannel() {
OC_Util::loadVersion(); OC_Util::loadVersion();
return \OC::$server->getConfig()->getSystemValue('updater.release.channel', self::$versionCache['OC_Channel']);
// 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'];
} }
/** /**

2
lib/public/Util.php
View File

@ -82,8 +82,6 @@ class Util {
* @since 8.1.0 * @since 8.1.0
*/ */
public static function setChannel($channel) { 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); \OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel);
} }

2
version.php
View File

@ -33,7 +33,7 @@ $OC_VersionString = '11.0 beta 2';
$OC_VersionCanBeUpgradedFrom = array(9, 1); $OC_VersionCanBeUpgradedFrom = array(9, 1);
// The ownCloud channel // default Nextcloud channel
$OC_Channel = 'git'; $OC_Channel = 'git';
// The build number // The build number