Fix previous commit (removed accidentally commited wfVarDump change + whitespace...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index aa90d41..def1474 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 {

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 332fd28..8fe2f52 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -426,7 +426,6 @@ class UploadForm {
                        return self::MIN_LENGHT_PARTNAME;
                }
 
-               
                $nt = Title::makeTitleSafe( NS_IMAGE, $filtered );
                if( is_null( $nt ) ) {
                        $resultDetails = array( 'filtered' => $filtered );