diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2014-12-25 09:48:15 +0100 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2014-12-25 09:48:15 +0100 |
| commit | 3dea2b95c67adfeaf8b9af062b6b586d2d845300 (patch) | |
| tree | 30116adc76bb103c4582e254d20a994620557fee | |
| parent | 0836ce9cd83aac7a6cd2a6396632f6ddd8b09f3a (diff) | |
| download | nextcloud-server-3dea2b95c67adfeaf8b9af062b6b586d2d845300.tar.gz nextcloud-server-3dea2b95c67adfeaf8b9af062b6b586d2d845300.zip | |
Automatically detect the edition based on the enterprise_key app.
| -rw-r--r-- | lib/private/util.php | 8 | ||||
| -rw-r--r-- | version.php | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index b97c0684629..25fcc7d9172 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 ""; + } + } /** 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'; |