From 94fa9213e41ea6e634da488d98dd713826aced95 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 20 Aug 2005 01:57:32 +0000
Subject: [PATCH] forward porting from REL1_5

---
 maintenance/dumpBackup.php       | 4 +++-
 maintenance/rebuildInterwiki.inc | 4 +++-
 maintenance/update.php           | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index c7266e9868..a15fbf2116 100644
--- 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 76ef6ffd62..34046274c2 100644
--- 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 ccb21bcc47..90647809f0 100644
--- 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" );
-- 
2.20.1