installer: Don't allow setting $wgDBmysql5

[lhc/web/wiklou.git] / includes / installer / MysqlInstaller.php

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index ab5701a..d4dcdc2 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 = [
@@ -73,7 +72,7 @@ class MysqlInstaller extends DatabaseInstaller {
         * @return bool
         */
        public function isCompiled() {
-               return self::checkExtension( 'mysql' ) || self::checkExtension( 'mysqli' );
+               return self::checkExtension( 'mysqli' );
        }
 
        /**
@@ -671,7 +670,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() );
 
@@ -679,9 +677,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}\";";
        }
 }