From: Antoine Musso <hashar@free.fr>
Date: Fri, 6 Jul 2012 18:22:00 +0000 (+0200)
Subject: parse.php Windows uses CTRL+Z as a EOF sequence
X-Git-Tag: 1.31.0-rc.0~23115
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=a9c1a81fe98b24722ae5d7599503e8c44348cb72;p=lhc%2Fweb%2Fwiklou.git

parse.php Windows uses CTRL+Z as a EOF sequence

Follow up:
1fc2bb9 - parse.php note about using ^D to end output

The previous patch assumed ^D to be the standard.

Change-Id: If573c1a03eb9679d74fcb24c1be6931eee361158
---

diff --git a/maintenance/parse.php b/maintenance/parse.php
index 15ed5ace18..464de10313 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -66,7 +66,8 @@ class CLIParser extends Maintenance {
 		$input_file = $this->getArg( 0, $php_stdin );
 
 		if( $input_file === $php_stdin ) {
-			$this->error( basename(__FILE__) .": warning: reading wikitext from STDIN. Press CTRL+D to parse.\n" );
+			$ctrl = wfIsWindows() ? 'CTRL+Z' : 'CTRL+D';
+			$this->error( basename(__FILE__) .": warning: reading wikitext from STDIN. Press $ctrl to parse.\n" );
 		}
 
 		return file_get_contents( $input_file );