forward porting from REL1_5

diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index c7266e9..a15fbf2 100644 (file)
--- a/maintenance/dumpBackup.php
+++ b/maintenance/dumpBackup.php
@@ -22,6 +22,8 @@
  * @subpackage SpecialPage
  */
 
+$originalDir = getcwd();
+
 $optionsWithArgs = array( 'server', 'pagelist' );
 
 require_once( 'commandLine.inc' );
@@ -141,7 +143,7 @@ if( isset( $options['server'] ) ) {
 
 if ( isset( $options['pagelist'] ) ) {
        $olddir = getcwd();
-       chdir( 'maintenance' );
+       chdir( $originalDir );
        $pages = file( $options['pagelist'] );
        chdir( $olddir );
        if ( $pages === false ) {

diff --git a/maintenance/rebuildInterwiki.inc b/maintenance/rebuildInterwiki.inc
index 76ef6ff..3404627 100644 (file)
--- a/maintenance/rebuildInterwiki.inc
+++ b/maintenance/rebuildInterwiki.inc
@@ -49,6 +49,7 @@ function getRebuildInterwikiSQL() {
                'textbookwiki' => 'wikibooks.org',
                'sep11wiki' => 'sep11.wikipedia.org',
                'metawiki' => 'meta.wikimedia.org',
+               'commonswiki' => 'commons.wikimedia.org',
        );
 
        $extraLinks = array(
@@ -77,7 +78,8 @@ function getRebuildInterwikiSQL() {
        }
 
        # Extract the intermap from meta
-       $lines = file( 'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw' );
+       $intermap = wfGetHTTP( 'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw' );
+       $lines = array_map( 'trim', explode( "\n", trim( $intermap ) ) );
 
        if ( !$lines ) {
                die( "m:Interwiki_map not found" );

diff --git a/maintenance/update.php b/maintenance/update.php
index ccb21bc..9064780 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -8,6 +8,7 @@
  */
 
 /** */
+$wgUseMasterForMaintenance = true;
 $options = array( 'quick' );
 require_once( "commandLine.inc" );
 require_once( "updaters.inc" );