wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatically detect the edition based on the enterprise_key app.

Browse source
This commit is contained in:
Frank Karlitschek 2014-12-25 09:48:15 +01:00
parent 0836ce9cd8
commit 3dea2b95c6
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/util.php
View file

@ -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 "";
}
}
/**

3
version.php
View file

@ -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';