From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 1 Jun 2018 21:49:45 +0000 (+0000)
Subject: Merge "installer: Don't allow setting $wgDBmysql5" into REL1_31
X-Git-Tag: 1.31.0~14
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=a3dfd8ee587608f14f25b63f87803999381041b1;hp=-c

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

a3dfd8ee587608f14f25b63f87803999381041b1
diff --combined includes/installer/MysqlInstaller.php
index 014b936524,d4dcdc2fec..45f932a83b
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@@ -40,7 -40,6 +40,6 @@@ class MysqlInstaller extends DatabaseIn
  		'wgDBpassword',
  		'wgDBprefix',
  		'wgDBTableOptions',
- 		'wgDBmysql5',
  	];
  
  	protected $internalDefaults = [
@@@ -414,6 -413,20 +413,6 @@@
  			$this->setVar( '_MysqlCharset', reset( $charsets ) );
  		}
  
 -		// Do charset selector
 -		if ( count( $charsets ) >= 2 ) {
 -			// getRadioSet() builds a set of labeled radio buttons.
 -			// For grep: The following messages are used as the item labels:
 -			// config-mysql-binary, config-mysql-utf8
 -			$s .= $this->getRadioSet( [
 -				'var' => '_MysqlCharset',
 -				'label' => 'config-mysql-charset',
 -				'itemLabelPrefix' => 'config-mysql-',
 -				'values' => $charsets
 -			] );
 -			$s .= $this->parent->getHelpBox( 'config-mysql-charset-help' );
 -		}
 -
  		return $s;
  	}
  
@@@ -657,7 -670,6 +656,6 @@@
  	}
  
  	public function getLocalSettings() {
- 		$dbmysql5 = wfBoolToStr( $this->getVar( 'wgDBmysql5', true ) );
  		$prefix = LocalSettingsGenerator::escapePhpString( $this->getVar( 'wgDBprefix' ) );
  		$tblOpts = LocalSettingsGenerator::escapePhpString( $this->getTableOptions() );
  
@@@ -665,9 -677,6 +663,6 @@@
  \$wgDBprefix = \"{$prefix}\";
  
  # MySQL table options to use during installation or update
- \$wgDBTableOptions = \"{$tblOpts}\";
- 
- # Experimental charset support for MySQL 5.0.
- \$wgDBmysql5 = {$dbmysql5};";
+ \$wgDBTableOptions = \"{$tblOpts}\";";
  	}
  }