From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 2 Oct 2010 08:29:01 +0000 (+0000)
Subject: removed call to deprecated function dbsource() and a comment that mentioned it
X-Git-Tag: 1.31.0-rc.0~34682
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=1360aadafd2131c661fe55a4626286063c8fa012;p=lhc%2Fweb%2Fwiklou.git

removed call to deprecated function dbsource() and a comment that mentioned it
---

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index ce05efeecc..dc41c87ce8 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -830,7 +830,11 @@ class DatabaseMssql extends DatabaseBase {
 		}
 		$this->doQuery( "DROP TABLE $ctest" );
 
-		$res = dbsource( "../maintenance/mssql/tables.sql", $this );
+		$res = $this->sourceFile( "../maintenance/mssql/tables.sql" );
+		if ( $err !== true ) {
+			echo " <b>FAILED</b></li>";
+			dieout( htmlspecialchars( $err ) );
+		}
 
 		# # Update version information
 		$mwv = $this->addQuotes( $wgVersion );
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 95c3db6d5f..0cbc51152d 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -555,7 +555,7 @@ class DatabaseSqlite extends DatabaseBase {
 
 	/**
 	 * Called by the installer script (when modified according to the MediaWikiLite installation instructions)
-	 * - this is the same way PostgreSQL works, MySQL reads in tables.sql and interwiki.sql using dbsource (which calls db->sourceFile)
+	 * - this is the same way PostgreSQL works, MySQL reads in tables.sql and interwiki.sql using DatabaseBase::sourceFile()
 	 */
 	public function setup_database() {
 		global $IP;