Merge pull request #13035 from owncloud/new_edition_detection
Automatically detect the edition based on the enterprise_key app.
This commit is contained in:
commit
2711863220
|
@ -285,8 +285,12 @@ class OC_Util {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getEditionString() {
|
public static function getEditionString() {
|
||||||
OC_Util::loadVersion();
|
if (OC_App::isEnabled('enterprise_key')) {
|
||||||
return \OC::$server->getSession()->get('OC_Edition');
|
return "Enterprise";
|
||||||
|
} else {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -321,8 +325,6 @@ class OC_Util {
|
||||||
$session->set('OC_Version', $OC_Version);
|
$session->set('OC_Version', $OC_Version);
|
||||||
/** @var $OC_VersionString string */
|
/** @var $OC_VersionString string */
|
||||||
$session->set('OC_VersionString', $OC_VersionString);
|
$session->set('OC_VersionString', $OC_VersionString);
|
||||||
/** @var $OC_Edition string */
|
|
||||||
$session->set('OC_Edition', $OC_Edition);
|
|
||||||
/** @var $OC_Channel string */
|
/** @var $OC_Channel string */
|
||||||
$session->set('OC_Channel', $OC_Channel);
|
$session->set('OC_Channel', $OC_Channel);
|
||||||
/** @var $OC_Build string */
|
/** @var $OC_Build string */
|
||||||
|
|
|
@ -8,9 +8,6 @@ $OC_Version=array(7, 8, 1, 0);
|
||||||
// The human readable string
|
// The human readable string
|
||||||
$OC_VersionString='8.0 pre alpha';
|
$OC_VersionString='8.0 pre alpha';
|
||||||
|
|
||||||
// The ownCloud edition
|
|
||||||
$OC_Edition='';
|
|
||||||
|
|
||||||
// The ownCloud channel
|
// The ownCloud channel
|
||||||
$OC_Channel='git';
|
$OC_Channel='git';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue