summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-28 18:38:34 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-28 18:38:34 +0100
commitebb243344a59f00ab7f293f381bcad6fa2e43503 (patch)
treec2425e4c71a7a4971308a59dc4b68083ffc50ab1
parentf0e6876f2ec8ec4576ca0ce8bbfee5bd8082dc1f (diff)
parent18b6fc93329a31fc5578ab359878079a900387d5 (diff)
downloadnextcloud-server-ebb243344a59f00ab7f293f381bcad6fa2e43503.tar.gz
nextcloud-server-ebb243344a59f00ab7f293f381bcad6fa2e43503.zip
Merge pull request #12499 from owncloud/disableMSSQL
Disable MSSQL and OCI for new CE installations
-rw-r--r--config/config.sample.php2
-rw-r--r--lib/private/setup.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 433ff9af0fb..26cc356fd04 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -831,7 +831,7 @@ $CONFIG = array(
/**
* Database types that are supported for installation. (SQLite is available only in
- * ownCloud Community Edition)
+ * ownCloud Community Edition, oci and mssql only for the Enterprise Edition)
*
* Available:
* - sqlite (SQLite3)
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 45c97bbd225..1443de18546 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -88,7 +88,7 @@ class OC_Setup {
)
);
$configuredDatabases = $this->config->getSystemValue('supportedDatabases',
- array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql'));
+ array('sqlite', 'mysql', 'pgsql'));
if(!is_array($configuredDatabases)) {
throw new Exception('Supported databases are not properly configured.');
}