summaryrefslogtreecommitdiffstats
path: root/lib/private/legacy
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-09-06 14:11:30 +0200
committerJoas Schilling <coding@schilljs.com>2016-09-06 16:05:28 +0200
commit7c0951244a176e0b42d2d66a4288d74460821a8c (patch)
tree3324f36c7f0f7b5a8a85cc8f3ab910af46b3b2f8 /lib/private/legacy
parent836c938583a2709adb21cdaafb3f000e8c77a086 (diff)
downloadnextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.tar.gz
nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.zip
Deprecate getEditionString()
Diffstat (limited to 'lib/private/legacy')
-rw-r--r--lib/private/legacy/app.php4
-rw-r--r--lib/private/legacy/util.php11
2 files changed, 3 insertions, 12 deletions
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 '';
}
/**