http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74134
Revision: 74134
Author: ialex
Date: 2010-10-02 08:29:01 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
removed call to deprecated function dbsource() and a comment that mentioned it
Modified Paths:
--------------
trunk/phase3/includes/db/DatabaseMssql.php
trunk/phase3/includes/db/DatabaseSqlite.php
Modified: trunk/phase3/includes/db/DatabaseMssql.php
===================================================================
--- trunk/phase3/includes/db/DatabaseMssql.php 2010-10-02 08:04:58 UTC (rev
74133)
+++ trunk/phase3/includes/db/DatabaseMssql.php 2010-10-02 08:29:01 UTC (rev
74134)
@@ -830,7 +830,11 @@
}
$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 );
Modified: trunk/phase3/includes/db/DatabaseSqlite.php
===================================================================
--- trunk/phase3/includes/db/DatabaseSqlite.php 2010-10-02 08:04:58 UTC (rev
74133)
+++ trunk/phase3/includes/db/DatabaseSqlite.php 2010-10-02 08:29:01 UTC (rev
74134)
@@ -555,7 +555,7 @@
/**
* 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;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
