Merge "installer: Don't allow setting $wgDBmysql5" into REL1_31

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 715f5df..90ba3c4 100644 (file)
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -38,7 +38,6 @@ class CliInstaller extends Installer {
                'dbpass' => 'wgDBpassword',
                'dbprefix' => 'wgDBprefix',
                'dbtableoptions' => 'wgDBTableOptions',
-               'dbmysql5' => 'wgDBmysql5',
                'dbport' => 'wgDBport',
                'dbschema' => 'wgDBmwschema',
                'dbpath' => 'wgSQLiteDataDir',

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 014b936..45f932a 100644 (file)
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -40,7 +40,6 @@ class MysqlInstaller extends DatabaseInstaller {
                'wgDBpassword',
                'wgDBprefix',
                'wgDBTableOptions',
-               'wgDBmysql5',
        ];
 
        protected $internalDefaults = [
@@ -657,7 +656,6 @@ class MysqlInstaller extends DatabaseInstaller {
        }
 
        public function getLocalSettings() {
-               $dbmysql5 = wfBoolToStr( $this->getVar( 'wgDBmysql5', true ) );
                $prefix = LocalSettingsGenerator::escapePhpString( $this->getVar( 'wgDBprefix' ) );
                $tblOpts = LocalSettingsGenerator::escapePhpString( $this->getTableOptions() );
 
@@ -665,9 +663,6 @@ class MysqlInstaller extends DatabaseInstaller {
 \$wgDBprefix = \"{$prefix}\";
 
 # MySQL table options to use during installation or update
-\$wgDBTableOptions = \"{$tblOpts}\";
-
-# Experimental charset support for MySQL 5.0.
-\$wgDBmysql5 = {$dbmysql5};";
+\$wgDBTableOptions = \"{$tblOpts}\";";
        }
 }