http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74138

Revision: 74138
Author:   ialex
Date:     2010-10-02 08:55:39 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
removed calls to dbsource()

Modified Paths:
--------------
    trunk/extensions/AbuseFilter/install.php
    trunk/extensions/LiquidThreads/migrateDatabase.php
    trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php
    trunk/extensions/MetavidWiki/maintenance/mv_update.php
    trunk/extensions/MultilingualLiquidThreads/LiquidThreads/migrateDatabase.php

Modified: trunk/extensions/AbuseFilter/install.php
===================================================================
--- trunk/extensions/AbuseFilter/install.php    2010-10-02 08:37:51 UTC (rev 
74137)
+++ trunk/extensions/AbuseFilter/install.php    2010-10-02 08:55:39 UTC (rev 
74138)
@@ -11,7 +11,7 @@
 if ( $wgDBtype == 'postgres' )
         $sqlfile = '/abusefilter.tables.pg.sql';
 
-dbsource( dirname( __FILE__ ) . $sqlfile );
+wfGetDB( DB_MASTER )->sourceFile( dirname( __FILE__ ) . $sqlfile );
 
 // Create the Abuse Filter user.
 wfLoadExtensionMessages( 'AbuseFilter' );

Modified: trunk/extensions/LiquidThreads/migrateDatabase.php
===================================================================
--- trunk/extensions/LiquidThreads/migrateDatabase.php  2010-10-02 08:37:51 UTC 
(rev 74137)
+++ trunk/extensions/LiquidThreads/migrateDatabase.php  2010-10-02 08:55:39 UTC 
(rev 74138)
@@ -34,19 +34,19 @@
 
 foreach ( $threadFieldUpdates as $field => $patch ) {
        if ( !$db->fieldExists( 'thread', $field, 'lqt-update-script' ) ) {
-               dbsource( dirname( __FILE__ ) . '/schema-changes/' . $patch );
+               $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' . 
$patch );
        }
 }
 
 foreach ( $threadIndexUpdates as $index => $patch ) {
        if ( !$db->indexExists( 'thread', $index, 'lqt-update-script' ) ) {
-               dbsource( dirname( __FILE__ ) . '/schema-changes/' . $patch );
+               $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' . 
$patch );
        }
 }
 
 foreach ( $newTableUpdates as $table => $patch ) {
        if ( !$db->tableExists( $table, 'lqt-update-script' ) ) {
-               dbsource( dirname( __FILE__ ) . '/schema-changes/' . $patch );
+               $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' . 
$patch );
        }
 }
 

Modified: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php        
2010-10-02 08:37:51 UTC (rev 74137)
+++ trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php        
2010-10-02 08:55:39 UTC (rev 74138)
@@ -73,7 +73,7 @@
                                require_once( "$IP/install-utils.inc" );
 
                                print '<p><b>Creating database 
tables</b><p><pre>';
-                               dbsource( 
"extensions/MetavidWiki/maintenance/mv_tables.sql" );
+                               wfGetDB( DB_MASTER )->sourceFile( 
"extensions/MetavidWiki/maintenance/mv_tables.sql" );
 
                                print '</p><p><b>Creating templates</b><pre>';
                                upTemplates( false );

Modified: trunk/extensions/MetavidWiki/maintenance/mv_update.php
===================================================================
--- trunk/extensions/MetavidWiki/maintenance/mv_update.php      2010-10-02 
08:37:51 UTC (rev 74137)
+++ trunk/extensions/MetavidWiki/maintenance/mv_update.php      2010-10-02 
08:55:39 UTC (rev 74138)
@@ -13,7 +13,7 @@
 $wgDatabase = new $dbclass( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, 
$wgDBname, 1 );
 
 //first run the mv_tables.sql
-dbsource('mv_tables.sql');
+$wgDatabase->sourceFile( 'mv_tables.sql' );
 
 // do mvd_index text removal update:
 // check if mvd_index has text field

Modified: 
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/migrateDatabase.php
===================================================================
--- 
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/migrateDatabase.php    
    2010-10-02 08:37:51 UTC (rev 74137)
+++ 
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/migrateDatabase.php    
    2010-10-02 08:55:39 UTC (rev 74138)
@@ -34,19 +34,19 @@
 
 foreach ( $threadFieldUpdates as $field => $patch ) {
        if ( !$db->fieldExists( 'thread', $field, 'lqt-update-script' ) ) {
-               dbsource( dirname( __FILE__ ) . '/schema-changes/' . $patch );
+               $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' . 
$patch );
        }
 }
 
 foreach ( $threadIndexUpdates as $index => $patch ) {
        if ( !$db->indexExists( 'thread', $index, 'lqt-update-script' ) ) {
-               dbsource( dirname( __FILE__ ) . '/schema-changes/' . $patch );
+               $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' . 
$patch );
        }
 }
 
 foreach ( $newTableUpdates as $table => $patch ) {
        if ( !$db->tableExists( $table, 'lqt-update-script' ) ) {
-               dbsource( dirname( __FILE__ ) . '/schema-changes/' . $patch );
+               $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' . 
$patch );
        }
 }
 



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to