From: Domas Mituzas <midom@users.mediawiki.org>
Date: Fri, 25 Jun 2010 09:36:39 +0000 (+0000)
Subject: r68558 fixes: add some escaping (just in case, not really needed), as well as import... 
X-Git-Tag: 1.31.0-rc.0~36389
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=cb827bfc3717752e21ddd9787cdba5bb1e022f42;p=lhc%2Fweb%2Fwiklou.git

r68558 fixes: add some escaping (just in case, not really needed), as well as import the variable via global
---

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index a23b7d2808..139c0b5e91 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -114,8 +114,10 @@ class DatabaseMysql extends DatabaseBase {
 					$this->query( 'SET NAMES utf8', __METHOD__ );
 				}
 				// Set SQL mode, default is turning them all off, can be overridden or skipped with null
-				if (is_string($wgSQLMode)) {
-					$this->query( "SET sql_mode = '$wgSQLMode'", __METHOD__ );
+				global $wgSQLMode;
+				if ( is_string( $wgSQLMode ) ) {
+					$mode = $this->addQuotes( $wgSQLMode );
+					$this->query( "SET sql_mode = $mode", __METHOD__ );
 				}
 			}