diff options
| author | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2015-05-13 20:00:46 +0300 |
|---|---|---|
| committer | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2015-05-13 20:29:33 +0300 |
| commit | af814ba2703b6ad63d567138fdba5d740d48496e (patch) | |
| tree | b9d36b86c0a9abcbad5f729d932ddcc416abcb5a | |
| parent | 4789e87a5378776738706b48d0db1cf1d989709a (diff) | |
| download | nextcloud-server-af814ba2703b6ad63d567138fdba5d740d48496e.tar.gz nextcloud-server-af814ba2703b6ad63d567138fdba5d740d48496e.zip | |
Allow change update channel via public API
| -rw-r--r-- | lib/private/util.php | 17 | ||||
| -rw-r--r-- | lib/public/util.php | 18 |
2 files changed, 33 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); + } } } diff --git a/lib/public/util.php b/lib/public/util.php index 6eb5c6034c1..f032d0a5431 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -69,6 +69,24 @@ class Util { public static function getVersion() { return(\OC_Util::getVersion()); } + + /** + * Set current update channel + * @param string $channel + */ + public static function setChannel($channel) { + //Flush timestamp to reload version.php + \OC::$server->getSession()->set('OC_Version_Timestamp', 0); + return \OC::$server->getAppConfig()->setValue('core', 'OC_Channel', $channel); + } + + /** + * Get current update channel + * @return string + */ + public static function getChannel() { + return \OC_Util::getChannel(); + } /** * send an email |