From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 2 Dec 2011 21:50:42 +0000 (+0000)
Subject: Per Timo, the second line would wipe out the first
X-Git-Tag: 1.31.0-rc.0~26193
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=b3e65d734fea7b99222f9a427c9706b99055e5ff;p=lhc%2Fweb%2Fwiklou.git

Per Timo, the second line would wipe out the first
---

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index c62c429ede..4bde72b84b 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -889,7 +889,7 @@ class DatabaseMysql extends DatabaseBase {
 	protected function getDefaultSchemaVars() {
 		$vars = parent::getDefaultSchemaVars();
 		$vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', $GLOBALS['wgDBTableOptions'] );
-		$vars['wgDBTableOptions'] = str_replace( 'CHARSET=mysql4', 'CHARSET=binary', $GLOBALS['wgDBTableOptions'] );
+		$vars['wgDBTableOptions'] = str_replace( 'CHARSET=mysql4', 'CHARSET=binary', $vars['wgDBTableOptions'] );
 		return $vars;
 	}