diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-29 18:19:31 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-29 18:19:31 +0200 |
| commit | 5ed38a75d64c06d923a580175f6ab732234694a1 (patch) | |
| tree | 07fbe359a6c3dbfd7bc587d4a06020be1169df96 /core | |
| parent | 3ef680d96623eb6350015843f56b55b593a053bd (diff) | |
| download | nextcloud-server-5ed38a75d64c06d923a580175f6ab732234694a1.tar.gz nextcloud-server-5ed38a75d64c06d923a580175f6ab732234694a1.zip | |
Remove remainings of mssql
Diffstat (limited to 'core')
| -rw-r--r-- | core/command/db/converttype.php | 5 | ||||
| -rw-r--r-- | core/js/setup.js | 5 | ||||
| -rw-r--r-- | core/templates/installation.php | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php index e6c0f5caa35..dd91d86b8d7 100644 --- a/core/command/db/converttype.php +++ b/core/command/db/converttype.php @@ -115,11 +115,6 @@ class ConvertType extends Command { 'Converting to SQLite (sqlite3) is currently not supported.' ); } - if ($type === 'mssql') { - throw new \InvalidArgumentException( - 'Converting to Microsoft SQL Server (mssql) is currently not supported.' - ); - } if ($type === $this->config->getSystemValue('dbtype', '')) { throw new \InvalidArgumentException(sprintf( 'Can not convert from %1$s to %1$s.', diff --git a/core/js/setup.js b/core/js/setup.js index cfa11a99c3a..cb299597451 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -4,8 +4,7 @@ $(document).ready(function() { sqlite:!!$('#hasSQLite').val(), mysql:!!$('#hasMySQL').val(), postgresql:!!$('#hasPostgreSQL').val(), - oracle:!!$('#hasOracle').val(), - mssql:!!$('#hasMSSQL').val() + oracle:!!$('#hasOracle').val() }; $('#selectDbType').buttonset(); @@ -28,7 +27,7 @@ $(document).ready(function() { $('#dbname').attr('pattern','[0-9a-zA-Z$_-]+'); }); - $('#mysql,#pgsql,#mssql').click(function() { + $('#mysql,#pgsql').click(function() { $('#use_other_db').slideDown(250); $('#use_oracle_db').slideUp(250); $('#sqliteInformation').hide(); diff --git a/core/templates/installation.php b/core/templates/installation.php index b686a1ca68c..8db55e4bdab 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -8,7 +8,6 @@ script('core', [ <input type='hidden' id='hasSQLite' value='<?php p($_['hasSQLite']) ?>'> <input type='hidden' id='hasPostgreSQL' value='<?php p($_['hasPostgreSQL']) ?>'> <input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'> -<input type='hidden' id='hasMSSQL' value='<?php p($_['hasMSSQL']) ?>'> <form action="index.php" method="post"> <input type="hidden" name="install" value="true"> <?php if(count($_['errors']) > 0): ?> @@ -79,7 +78,7 @@ script('core', [ <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> <fieldset id='databaseBackend'> - <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) + <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> <legend><?php p($l->t( 'Configure the database' )); ?></legend> <div id="selectDbType"> |