summaryrefslogtreecommitdiffstats
path: root/settings/Controller/CheckSetupController.php
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 /settings/Controller/CheckSetupController.php
parent836c938583a2709adb21cdaafb3f000e8c77a086 (diff)
downloadnextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.tar.gz
nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.zip
Deprecate getEditionString()
Diffstat (limited to 'settings/Controller/CheckSetupController.php')
-rw-r--r--settings/Controller/CheckSetupController.php10
1 files changed, 2 insertions, 8 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 3881952872f..d9e4846672c 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -174,19 +174,13 @@ class CheckSetupController extends Controller {
* @return string
*/
private function isUsedTlsLibOutdated() {
- // Appstore is disabled by default in EE
- $appStoreDefault = false;
- if (\OC_Util::getEditionString() === '') {
- $appStoreDefault = true;
- }
-
// Don't run check when:
// 1. Server has `has_internet_connection` set to false
// 2. AppStore AND S2S is disabled
if(!$this->config->getSystemValue('has_internet_connection', true)) {
return '';
}
- if(!$this->config->getSystemValue('appstoreenabled', $appStoreDefault)
+ if(!$this->config->getSystemValue('appstoreenabled', true)
&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
return '';
@@ -200,7 +194,7 @@ class CheckSetupController extends Controller {
}
$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
- if(!$this->config->getSystemValue('appstoreenabled', $appStoreDefault)) {
+ if(!$this->config->getSystemValue('appstoreenabled', true)) {
$features = (string)$this->l10n->t('Federated Cloud Sharing');
}