From ae741e3ec7f65b61c938444354674e08402f9879 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 19 Feb 2006 23:00:00 +0000
Subject: [PATCH] * Fix --report interval option for dumpTextPass

---
 RELEASE-NOTES                | 1 +
 maintenance/backup.inc       | 6 ++++++
 maintenance/dumpBackup.php   | 8 +-------
 maintenance/dumpTextPass.php | 5 -----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6c7428903e..9bced72022 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -643,6 +643,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Fix explicit s-maxage=0 on raw pages; should help with proxy issues in
   generated stylesheets... hopefully...
 * (bug 4685) More fixes for Slovenian project namespace
+* Fix --report interval option for dumpTextPass
 
 
 === Caveats ===
diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index bef9b3f3b3..6825c4d31e 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -123,6 +123,12 @@ class BackupDumper {
 					unset( $sink );
 					$sink = $filter;
 
+					break;
+				case "report":
+					$this->reportingInterval = intval( $val );
+					break;
+				case "server":
+					$this->server = $val;
 					break;
 				default:
 					$this->processOption( $opt, $val, $param );
diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index 6f90fc5d11..1cb838fd2e 100644
--- a/maintenance/dumpBackup.php
+++ b/maintenance/dumpBackup.php
@@ -24,7 +24,7 @@
 
 $originalDir = getcwd();
 
-$optionsWithArgs = array( 'server', 'pagelist', 'start', 'end' );
+$optionsWithArgs = array( 'pagelist', 'start', 'end' );
 
 require_once( 'commandLine.inc' );
 require_once( 'SpecialExport.php' );
@@ -35,12 +35,6 @@ $dumper = new BackupDumper( $argv );
 if( isset( $options['quiet'] ) ) {
 	$dumper->reporting = false;
 }
-if( isset( $options['report'] ) ) {
-	$dumper->reportingInterval = intval( $options['report'] );
-}
-if( isset( $options['server'] ) ) {
-	$dumper->server = $options['server'];
-}
 
 if ( isset( $options['pagelist'] ) ) {
 	$olddir = getcwd();
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 5991ec4a79..fc8c15eede 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -24,8 +24,6 @@
 
 $originalDir = getcwd();
 
-$optionsWithArgs = array( 'server', 'pagelist', 'start', 'end' );
-
 require_once( 'commandLine.inc' );
 require_once( 'SpecialExport.php' );
 require_once( 'maintenance/backup.inc' );
@@ -210,9 +208,6 @@ class TextPassDumper extends BackupDumper {
 
 
 $dumper = new TextPassDumper( $argv );
-if( isset( $options['server'] ) ) {
-	$dumper->server = $options['server'];
-}
 
 if( true ) {
 	$dumper->dump();
-- 
2.20.1