From: Nick Jenkins <nickj@users.mediawiki.org>
Date: Mon, 6 Nov 2006 05:07:27 +0000 (+0000)
Subject: * Prevent PHP "Notice:  Undefined property:  UploadForm::$mUploadTempFileSize in... 
X-Git-Tag: 1.31.0-rc.0~55273
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=a7c7995d8cecdc13910e6b892a728b372ac0ca7f;p=lhc%2Fweb%2Fwiklou.git

* Prevent PHP "Notice:  Undefined property:  UploadForm::$mUploadTempFileSize in /includes/SpecialUpload.php on line 114" when an upload fails (e.g. by starting a URL string with "HTTP://" and not "") in error_reporting(E_ALL) mode, by initializing $mUploadTempFileSize to zero.
* Allow URL strings to start with a case-insensitive protocol string (e.g. "Http://" or "FTP://").
---

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 5704e2733e..c91f9101e1 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -28,6 +28,7 @@ class UploadForm {
 	var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion;
 	var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload;
 	var $mOname, $mSessionKey, $mStashed, $mDestFile, $mRemoveTempFile, $mSourceType;
+	var $mUploadTempFileSize = 0;
 	/**#@-*/
 
 	/**
@@ -134,13 +135,12 @@ class UploadForm {
 
 		# Maybe remove some pasting blanks :-)
 		$url =  trim( $url );
-		if( substr( $url, 0, 7 ) != 'http://' && substr( $url, 0, 6 ) != 'ftp://' ) {
+		if( stripos($url, 'http://') !== 0 && stripos($url, 'ftp://') !== 0 ) {
 			# Only HTTP or FTP URLs
 			return true;
 		}
 
 		# Open temporary file
-		$this->mUploadTempFileSize = 0;
 		$this->mUploadTempFile = @fopen( $this->mUploadTempName, "wb" );
 		if( $this->mUploadTempFile === false ) {
 			# Could not open temporary file to write in