aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-10-08 14:52:52 +0200
committerLukas Reschke <lukas@owncloud.com>2015-10-08 14:52:52 +0200
commit9866037d0cbcdfc19d0ebb047632892e444b5dc2 (patch)
tree4c9d95b0189180a76f6c3963fd0cf55f1f0719f1
parent8d2c8cf2a262d6299932125872fb0d536881a058 (diff)
downloadnextcloud-server-9866037d0cbcdfc19d0ebb047632892e444b5dc2.tar.gz
nextcloud-server-9866037d0cbcdfc19d0ebb047632892e444b5dc2.zip
Disable app store for EE by default
This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc. Administrators can still enable the app store by setting `appstoreenabled` to true in the config file.
-rw-r--r--lib/private/ocsclient.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index 1dfab4dd3a4..e2973f82605 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -68,7 +68,13 @@ class OCSClient {
* @return bool
*/
public function isAppStoreEnabled() {
- return $this->config->getSystemValue('appstoreenabled', true) === true;
+ // 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;
}
/**