From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 22 Jul 2009 19:42:02 +0000 (+0000)
Subject: * no need to pass "$asyncdownload = false", this is not python :)
X-Git-Tag: 1.31.0-rc.0~40769
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=a3e42efcc119bdcbd38a453614fed55674700808;p=lhc%2Fweb%2Fwiklou.git

* no need to pass "$asyncdownload = false", this is not python :)
* added new line at the end of wfDebug() call
* change ereg(i) to preg_match, the former is deprecated since PHP 5.3
---

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index d2f94ea48f..97cd1987d5 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -66,7 +66,7 @@ class UploadBase {
 
 		$type = ucfirst( $type );
 		$className = 'UploadFrom' . $type;
-		wfDebug( __METHOD__ . ": class name: $className" );
+		wfDebug( __METHOD__ . ": class name: $className\n" );
 		if( !in_array( $type, self::$uploadHandlers ) )
 			return null;
 
@@ -638,7 +638,7 @@ class UploadBase {
 		wfDebug( __METHOD__ . ": checking for embedded scripts and HTML stuff\n" );
 
 		#check for HTML doctype
-		if( eregi( "<!DOCTYPE *X?HTML", $chunk ) )
+		if ( preg_match( "/<!DOCTYPE *X?HTML/i", $chunk ) )
 			return true;
 
 		/**
@@ -951,7 +951,7 @@ class UploadBase {
 					substr( $partname , 3, 3 ) == 'px-' ||
 					substr( $partname , 2, 3 ) == 'px-'
 				) &&
-				ereg( "[0-9]{2}" , substr( $partname , 0, 2) );
+				preg_match( "/[0-9]{2}/" , substr( $partname , 0, 2 ) );
 	}
 
 	/**
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 4533ef96b9..8765a3bba8 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -62,7 +62,7 @@ class UploadFromUrl extends UploadBase {
 		return $this->initialize(
 			$desiredDestName,
 	 		$request->getVal( 'wpUploadFileURL' ),
-			$asyncdownload = false
+			false
 		);
 	}