From 4173e50e940120d4c3ec9e5170b31d0947da651c Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Wed, 15 Jul 2009 23:00:33 +0000
Subject: [PATCH] Some Strict Standards fixes per r53282 c3194

---
 includes/specials/SpecialUpload.php |  4 +++-
 includes/upload/UploadFromUrl.php   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index f0d0bae904..56201a2f76 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -24,6 +24,7 @@ class UploadForm extends SpecialPage {
 	var $uploadFormTextTop;
 	var $uploadFormTextAfterSummary;
     var $mTokenOk = false;
+    var $mForReUpload = false;
 	/**#@-*/
 
 	/**
@@ -74,6 +75,7 @@ class UploadForm extends SpecialPage {
 		$this->mDestWarningAck    = $request->getText( 'wpDestFileWarningAck' );
 
 		$this->mForReUpload       = $request->getBool( 'wpForReUpload' );
+
 		$this->mReUpload          = $request->getCheck( 'wpReUpload' );
 
 		$this->mAction            = $request->getVal( 'action' );
@@ -752,7 +754,7 @@ wgUploadAutoFill = {$autofill};
 		$sourcefilename = wfMsgExt( 'sourcefilename', array( 'parseinline', 'escapenoentities' ) );
         $destfilename = wfMsgExt( 'destfilename', array( 'parseinline', 'escapenoentities' ) );
 
-		$msg = $this->mForReUpload ? 'filereuploadsummary' : 'fileuploadsummary';
+		$msg = ( $this->mForReUpload )  ? 'filereuploadsummary' : 'fileuploadsummary';
 		$summary = wfMsgExt( $msg, 'parseinline' );
 
 		$licenses = new Licenses();
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index f9a7a3d462..2b2a33244f 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -3,7 +3,7 @@
 class UploadFromUrl extends UploadBase {
 	protected $mTempDownloadPath;
 
-	// by default do a SYNC_DOWNLOAD 
+	// by default do a SYNC_DOWNLOAD
 	protected $dl_mode = null;
 
 	/**
@@ -24,12 +24,12 @@ class UploadFromUrl extends UploadBase {
 	}
 
 	/* entry point for API upload:: ASYNC_DOWNLOAD (if possible) */
-	function initialize( $name, $url, $asyncdownload = false ) {
-		global $wgTmpDirectory, $wgPhpCliPath;
+	function initialize( $name, $url, $asyncdownload, $na = false ) {
+		global $wgTmpDirectory, $wgPhpCli;
 
-		// check for $asyncdownload request: 
+		// check for $asyncdownload request:
 		if( $asyncdownload !== false){
-			if( $wgPhpCliPath && wfShellExecEnabled() ){
+			if( $wgPhpCli && wfShellExecEnabled() ){
 				$this->dl_mode = Http::ASYNC_DOWNLOAD;
 			} else {
 				$this->dl_mode = Http::SYNC_DOWNLOAD;
@@ -54,7 +54,7 @@ class UploadFromUrl extends UploadBase {
 
 		// set dl mode if not set:
 		if( !$this->dl_mode )
-			$this->dl_mode = Http::SYNC_DOWNLOAD;	
+			$this->dl_mode = Http::SYNC_DOWNLOAD;
 
 		$desiredDestName = $request->getText( 'wpDestFile' );
 		if( !$desiredDestName )
@@ -69,7 +69,7 @@ class UploadFromUrl extends UploadBase {
 	 * Do the real fetching stuff
 	 */
 	function fetchFile() {
-		// entry point for SpecialUplaod 
+		// entry point for SpecialUplaod
 		if( self::isValidURI( $this->mUrl ) === false ) {
 			return Status::newFatal( 'upload-proto-error' );
 		}
@@ -77,7 +77,7 @@ class UploadFromUrl extends UploadBase {
 		// now do the actual download to the target file:
 		$status = Http::doDownload( $this->mUrl, $this->mTempPath, $this->dl_mode );
 
-		// update the local filesize var: 
+		// update the local filesize var:
 		$this->mFileSize = filesize( $this->mTempPath );
 
 		return $status;
-- 
2.20.1