Per siebrand and Nikerabbit (tweak for r47535):

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 8af83ac..c9a7693 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -89,6 +89,19 @@ if ( !function_exists( 'array_diff_key' ) ) {
        }
 }
 
+// Support for Wietse Venema's taint feature
+if ( !function_exists( 'istainted' ) ) {
+       function istainted( $var ) {
+               return 0;
+       }
+       function taint( $var, $level = 0 ) {}
+       function untaint( $var, $level = 0 ) {}
+       define( 'TC_HTML', 1 );
+       define( 'TC_SHELL', 1 );
+       define( 'TC_MYSQL', 1 );
+       define( 'TC_PCRE', 1 );
+       define( 'TC_SELF', 1 );
+}
 /// @endcond
 
 
@@ -973,11 +986,11 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) {
        } else {
                $nlink = '<a href="' . $title->escapeLocalUrl( $q ) . "\" class=\"mw-nextlink\">{$next}</a>";
        }
-       $nums = wfNumLink( $offset, 20, $title, $query ) . ' | ' .
-         wfNumLink( $offset, 50, $title, $query ) . ' | ' .
-         wfNumLink( $offset, 100, $title, $query ) . ' | ' .
-         wfNumLink( $offset, 250, $title, $query ) . ' | ' .
-         wfNumLink( $offset, 500, $title, $query );
+       $nums = $wgLang->pipeList( array( wfNumLink( $offset, 20, $title, $query ),
+         wfNumLink( $offset, 50, $title, $query ),
+         wfNumLink( $offset, 100, $title, $query ),
+         wfNumLink( $offset, 250, $title, $query ),
+         wfNumLink( $offset, 500, $title, $query ) ) );
 
        return wfMsg( 'viewprevnext', $plink, $nlink, $nums );
 }
@@ -2942,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.
  */