diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-12-28 13:36:59 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-12-28 13:36:59 +0100 |
| commit | 2711863220e452a4132766cbd1836cb453e0616b (patch) | |
| tree | c2655cc017e138627b3076c5d6c4e6c476abc8d7 | |
| parent | 1785ca484bb7ab40168f6413addbb7939d16b1b3 (diff) | |
| parent | 4a40e5699c27a4aee11205232e71e0b6b8fc8c96 (diff) | |
| download | nextcloud-server-2711863220e452a4132766cbd1836cb453e0616b.tar.gz nextcloud-server-2711863220e452a4132766cbd1836cb453e0616b.zip | |
Merge pull request #13035 from owncloud/new_edition_detection
Automatically detect the edition based on the enterprise_key app.
| -rw-r--r-- | lib/private/util.php | 10 | ||||
| -rw-r--r-- | version.php | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index b97c0684629..947b6471ea8 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -285,8 +285,12 @@ class OC_Util { * @return string */ public static function getEditionString() { - OC_Util::loadVersion(); - return \OC::$server->getSession()->get('OC_Edition'); + if (OC_App::isEnabled('enterprise_key')) { + return "Enterprise"; + } else { + return ""; + } + } /** @@ -321,8 +325,6 @@ class OC_Util { $session->set('OC_Version', $OC_Version); /** @var $OC_VersionString string */ $session->set('OC_VersionString', $OC_VersionString); - /** @var $OC_Edition string */ - $session->set('OC_Edition', $OC_Edition); /** @var $OC_Channel string */ $session->set('OC_Channel', $OC_Channel); /** @var $OC_Build string */ diff --git a/version.php b/version.php index 4421a06bea0..70ecf6c916a 100644 --- a/version.php +++ b/version.php @@ -8,9 +8,6 @@ $OC_Version=array(7, 8, 1, 0); // The human readable string $OC_VersionString='8.0 pre alpha'; -// The ownCloud edition -$OC_Edition=''; - // The ownCloud channel $OC_Channel='git'; |