From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 2 Oct 2010 21:58:04 +0000 (+0000)
Subject: And while I'm a it:
X-Git-Tag: 1.31.0-rc.0~34666
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=6da6645192af14c7d18bfcd0233e232489021732;p=lhc%2Fweb%2Fwiklou.git

And while I'm a it:
* Fixed E_STRICT about different signature of TextPassDumper::dump() and BackupDumper::dump()
* Add the possibility to show the help message...
---

diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index ee2fbcc6d5..33413a0dd9 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -50,7 +50,7 @@ class TextPassDumper extends BackupDumper {
 	var $spawnRead = false;
 	var $spawnErr = false;
 
-	function dump() {
+	function dump( $history, $text = WikiExporter::TEXT ) {
 		# This shouldn't happen if on console... ;)
 		header( 'Content-type: text/html; charset=UTF-8' );
 
@@ -467,8 +467,8 @@ class TextPassDumper extends BackupDumper {
 
 $dumper = new TextPassDumper( $argv );
 
-if ( true ) {
-	$dumper->dump();
+if ( !isset( $options['help'] ) ) {
+	$dumper->dump( true );
 } else {
 	$dumper->progress( <<<ENDS
 This script postprocesses XML dumps from dumpBackup.php to add
@@ -489,6 +489,7 @@ Options:
   --server=h  Force reading from MySQL server h
   --current	  Base ETA on number of pages in database instead of all revisions
   --spawn	  Spawn a subprocess for loading text records
+  --help      Display this help message
 ENDS
 );
 }