From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 10 Oct 2010 14:39:16 +0000 (+0000)
Subject: Follow up r74135 removing the globals, too.
X-Git-Tag: 1.31.0-rc.0~34547
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=c780168f9f9e368586921f63845b890c14eaeebf;p=lhc%2Fweb%2Fwiklou.git

Follow up r74135 removing the globals, too.
htmlescape the global.
---

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 8be7ebbc8d..1284ce5461 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -815,7 +815,7 @@ class DatabaseMssql extends DatabaseBase {
 	}
 
 	function setup_database() {
-		global $wgVersion, $wgDBport, $wgDBuser;
+		global $wgDBuser;
 
 		// Make sure that we can write to the correct schema
 		$ctest = "mediawiki_test_table";
@@ -825,7 +825,7 @@ class DatabaseMssql extends DatabaseBase {
 		$SQL = "CREATE TABLE $ctest (a int)";
 		$res = $this->doQuery( $SQL );
 		if ( !$res ) {
-			print "<b>FAILED</b>. Make sure that the user \"$wgDBuser\" can write to the database</li>\n";
+			print "<b>FAILED</b>. Make sure that the user " . htmlspecialchars( $wgDBuser ) . " can write to the database</li>\n";
 			dieout( "</ul>" );
 		}
 		$this->doQuery( "DROP TABLE $ctest" );