Revert r37443 for the moment:

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 2f1b60b..b7ac5d1 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -862,10 +862,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
  */
 function wfVarDump( $var ) {
        global $wgOut;
-       ob_start();
-       var_dump( $var );
-       $s = str_replace("\n","<br />\n", ob_get_contents() . "\n");
-       ob_end_clean();
+       $s = str_replace("\n","<br />\n", var_export( $var, true ) . "\n");
        if ( headers_sent() || !@is_object( $wgOut ) ) {
                print $s;
        } else {
@@ -2367,24 +2364,3 @@ function wfGenerateToken( $salt = '' ) {
 
        return md5( mt_rand( 0, 0x7fffffff ) . $salt );
 }
-
-/**
- * Checks filename for validity
- * @param mixed $title Filename or title to check
- */
-function wfIsValidFileName( $name ) {
-       if( !$name instanceof Title ) 
-               if( !Title::makeTitleSafe( NS_IMAGE, $name ) )
-                       return false;
-       else
-               $name = $name->getText();
-
-       if( in_string( ':', $name ) )
-               return false;
-       elseif( wfBaseName( $name ) != $name )
-               return false;
-       elseif( wfIsWindows() && ( in_string( '*', $name ) || in_string( '?', $name ) ) )
-               return false;
-       else
-               return true;
-}