From 7c0951244a176e0b42d2d66a4288d74460821a8c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 6 Sep 2016 14:11:30 +0200 Subject: Deprecate getEditionString() --- lib/private/legacy/app.php | 4 +--- lib/private/legacy/util.php | 11 ++--------- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'lib/private/legacy') 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 ''; } /** -- cgit v1.2.3