diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-26 11:42:41 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-26 11:42:41 +0200 |
| commit | 3babcd034438476aa87c1b970d6cfa98f2ded625 (patch) | |
| tree | 13699851f383e649a9db40f5e4244c3f97918b28 /lib/private/util.php | |
| parent | 6198fb20cb20af2c9192a470f6cb2be4c43721ad (diff) | |
| parent | 4c9734f6307b0773f7d92e19c62a58ad4e6ef7f1 (diff) | |
| download | nextcloud-server-3babcd034438476aa87c1b970d6cfa98f2ded625.tar.gz nextcloud-server-3babcd034438476aa87c1b970d6cfa98f2ded625.zip | |
Merge pull request #16339 from owncloud/master-override-channel
Allow change update channel via public API
Diffstat (limited to 'lib/private/util.php')
| -rw-r--r-- | lib/private/util.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index 4470006b90c..c2f7d0d1a87 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -385,10 +385,23 @@ class OC_Util { $session->set('OC_Version', $OC_Version); /** @var $OC_VersionString string */ $session->set('OC_VersionString', $OC_VersionString); - /** @var $OC_Channel string */ - $session->set('OC_Channel', $OC_Channel); /** @var $OC_Build string */ $session->set('OC_Build', $OC_Build); + + // Allow overriding update channel + + if (\OC::$server->getSystemConfig()->getValue('installed', false)) { + $channel = \OC::$server->getAppConfig()->getValue('core', 'OC_Channel'); + } else { + $channel = $OC_Channel; + } + + if (!is_null($channel)) { + $session->set('OC_Channel', $channel); + } else { + /** @var $OC_Channel string */ + $session->set('OC_Channel', $OC_Channel); + } } } |