* Fix --report interval option for dumpTextPass

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6c74289..9bced72 100644 (file)
--- 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 bef9b3f..6825c4d 100644 (file)
--- 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 6f90fc5..1cb838f 100644 (file)
--- 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 5991ec4..fc8c15e 100644 (file)
--- 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();