X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fparse.php;h=17a8d2ebf4f0ba58aaf2e6f6ed4b0aaede2ed653;hb=4ea621e2365319bbb8d35329bbd56a81ebe7251c;hp=638d7c5b2a81374bc9f8888cd2dae37bacff9288;hpb=3b07da886220352c3e393ec09b0c674b3968d5ad;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/parse.php b/maintenance/parse.php
index 638d7c5b2a..17a8d2ebf4 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -3,7 +3,7 @@
  * Parse some wikitext.
  *
  * Wikitext can be given by stdin or using a file. The wikitext will be parsed
- * using 'CLIParser' as a title. This can be overriden with --title option.
+ * using 'CLIParser' as a title. This can be overridden with --title option.
  *
  * Example1:
  * @code
@@ -61,7 +61,7 @@ class CLIParser extends Maintenance {
 
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Parse a given wikitext";
+		$this->addDescription( 'Parse a given wikitext' );
 		$this->addOption(
 			'title',
 			'Title name for the given wikitext (Default: \'CLIParser\')',
@@ -73,7 +73,7 @@ class CLIParser extends Maintenance {
 
 	public function execute() {
 		$this->initParser();
-		print $this->render( $this->WikiText() );
+		print $this->render( $this->Wikitext() );
 	}
 
 	/**
@@ -89,11 +89,10 @@ class CLIParser extends Maintenance {
 	 * @return string Wikitext
 	 */
 	protected function Wikitext() {
-
 		$php_stdin = 'php://stdin';
 		$input_file = $this->getArg( 0, $php_stdin );
 
-		if ( $input_file === $php_stdin ) {
+		if ( $input_file === $php_stdin && !$this->mQuiet ) {
 			$ctrl = wfIsWindows() ? 'CTRL+Z' : 'CTRL+D';
 			$this->error( basename( __FILE__ )
 				. ": warning: reading wikitext from STDIN. Press $ctrl to parse.\n" );
@@ -110,7 +109,7 @@ class CLIParser extends Maintenance {
 
 	/**
 	 * Title object to use for CLI parsing.
-	 * Default title is 'CLIParser', it can be overriden with the option
+	 * Default title is 'CLIParser', it can be overridden with the option
 	 * --title <Your:Title>
 	 *
 	 * @return Title