summaryrefslogtreecommitdiffstats
path: root/lib/private/util.php
diff options
context:
space:
mode:
authorVictor Dubiniuk <victor.dubiniuk@gmail.com>2015-05-13 20:00:46 +0300
committerVictor Dubiniuk <victor.dubiniuk@gmail.com>2015-05-13 20:29:33 +0300
commitaf814ba2703b6ad63d567138fdba5d740d48496e (patch)
treeb9d36b86c0a9abcbad5f729d932ddcc416abcb5a /lib/private/util.php
parent4789e87a5378776738706b48d0db1cf1d989709a (diff)
downloadnextcloud-server-af814ba2703b6ad63d567138fdba5d740d48496e.tar.gz
nextcloud-server-af814ba2703b6ad63d567138fdba5d740d48496e.zip
Allow change update channel via public API
Diffstat (limited to 'lib/private/util.php')
-rw-r--r--lib/private/util.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 367199f7735..46fb929a6bc 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -388,10 +388,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);
+ }
}
}