From: Victor Vasiliev <vasilievvv@users.mediawiki.org>
Date: Thu, 10 Jul 2008 08:32:34 +0000 (+0000)
Subject: Fix previous commit (removed accidentally commited wfVarDump change + whitespace... 
X-Git-Tag: 1.31.0-rc.0~46584
X-Git-Url: https://git.cyclocoop.org/%27%20.%20%24this-%3EgetSkin%28%29-%3EescapeSearchLink%28%29%20.%20%27?a=commitdiff_plain;h=0c6e06d583e621d08090f967d87bdfc2abfdee59;p=lhc%2Fweb%2Fwiklou.git

Fix previous commit (removed accidentally commited wfVarDump change + whitespace fix)
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index aa90d41ef3..def14742e6 100644
--- 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 332fd281d7..8fe2f52f59 100644
--- 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 );