-function dbsource( $fname, $database = false ) {
- $fp = fopen( $fname, "r" );
- if ( false === $fp ) {
- print "Could not open \"{$fname}\".\n";
- exit();
- }
-
- $cmd = "";
- $done = false;
-
- while ( ! feof( $fp ) ) {
- $line = trim( fgets( $fp, 1024 ) );
- $sl = strlen( $line ) - 1;
-
- if ( $sl < 0 ) { continue; }
- if ( "-" == $line{0} && "-" == $line{1} ) { continue; }
-
- if ( ";" == $line{$sl} ) {
- $done = true;
- $line = substr( $line, 0, $sl );
- }
-
- if ( "" != $cmd ) { $cmd .= " "; }
- $cmd .= $line;
-
- if ( $done ) {
- $cmd = replacevars( $cmd );
- if( $database )
- $res = $database->query( $cmd );
- else
- $res = mysql_query( $cmd );
-
- if ( false === $res ) {
- $err = mysql_error();
- print "Query \"{$cmd}\" failed with error code \"$err\".\n";
- exit();
- }
-
- $cmd = "";
- $done = false;
+function dbsource( $fname, $db = false ) {
+ if ( !$db ) {
+ // Try $wgDatabase, which is used in the install and update scripts
+ global $wgDatabase;
+ if ( isset( $wgDatabase ) ) {
+ $db = $wgDatabase;
+ } else {
+ // No? Well, we must be outside of those scripts, so use the standard method
+ $db = wfGetDB( DB_MASTER );