* Fixed a whole lot of XSS vulnerabilities in the installer. All require a live insta...

[lhc/web/wiklou.git] / includes / GlobalFunctions.php

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 42e1e46..ef5aac5 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2955,6 +2955,21 @@ function wfWaitForSlaves( $maxLag ) {
        }
 }
 
+/**
+ * Output some plain text in command-line mode or in the installer (updaters.inc).
+ * Do not use it in any other context, its behaviour is subject to change.
+ */
+function wfOut( $s ) {
+       static $lineStarted = false;
+       global $wgCommandLineMode;
+       if ( $wgCommandLineMode && !defined( 'MEDIAWIKI_INSTALL' ) ) {
+               echo $s;
+       } else {
+               echo htmlspecialchars( $s );
+       }
+       flush();
+}
+
 /** Generate a random 32-character hexadecimal token.
  * @param mixed $salt Some sort of salt, if necessary, to add to random characters before hashing.
  */