diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/OCSClient.php | 8 | ||||
| -rw-r--r-- | lib/private/Updater/VersionCheck.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/app.php | 4 | ||||
| -rw-r--r-- | lib/private/legacy/util.php | 11 |
4 files changed, 5 insertions, 20 deletions
diff --git a/lib/private/OCSClient.php b/lib/private/OCSClient.php index d864e6d4dcb..76c0b136c06 100644 --- a/lib/private/OCSClient.php +++ b/lib/private/OCSClient.php @@ -70,13 +70,7 @@ class OCSClient { * @return bool */ public function isAppStoreEnabled() { - // For a regular edition default to true, all others default to false - $default = false; - if (\OC_Util::getEditionString() === '') { - $default = true; - } - - return $this->config->getSystemValue('appstoreenabled', $default) === true; + return $this->config->getSystemValue('appstoreenabled', true) === true; } /** diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index d240687f9bd..6f6508d314c 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -71,7 +71,7 @@ class VersionCheck { $version['installed'] = $this->config->getAppValue('core', 'installedat'); $version['updated'] = $this->config->getAppValue('core', 'lastupdatedat'); $version['updatechannel'] = \OC_Util::getChannel(); - $version['edition'] = \OC_Util::getEditionString(); + $version['edition'] = ''; $version['build'] = \OC_Util::getBuild(); $versionString = implode('x', $version); diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 1efd3bceb23..d964212f3bb 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -437,9 +437,7 @@ class OC_App { $settings = array(); // by default, settings only contain the help menu - if (OC_Util::getEditionString() === '' && - \OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true - ) { + if (\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true)) { $settings = array( array( "id" => "help", diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 648be70cf0d..04dcb8fc896 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -382,18 +382,11 @@ class OC_Util { } /** - * @description get the current installed edition of ownCloud. There is the community - * edition that just returns an empty string and the enterprise edition - * that returns "Enterprise". + * @deprecated the value is of no use anymore * @return string */ public static function getEditionString() { - if (OC_App::isEnabled('enterprise_key')) { - return "Enterprise"; - } else { - return ""; - } - + return ''; } /** |