From 13cd80b13947b2c681b28f1f7c6864b8a3dc5b18 Mon Sep 17 00:00:00 2001
From: Erik Moeller <erik@users.mediawiki.org>
Date: Mon, 14 Mar 2005 04:16:27 +0000
Subject: [PATCH] no need to show PHP's internal errors if we make our own
 error messages

---
 includes/SpecialUpload.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index a5b32f0971..194c9371e9 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -300,7 +300,7 @@ class UploadForm {
 		if( is_file( $this->mSavedFile ) ) {
 			$this->mUploadOldVersion = gmdate( 'YmdHis' ) . "!{$saveName}";
 
-			if( !rename( $this->mSavedFile, "${archive}/{$this->mUploadOldVersion}" ) ) { 
+			if( @!rename( $this->mSavedFile, "${archive}/{$this->mUploadOldVersion}" ) ) { 
 				$wgOut->fileRenameError( $this->mSavedFile,
 				  "${archive}/{$this->mUploadOldVersion}" );
 				return false;
@@ -310,12 +310,12 @@ class UploadForm {
 		}
 		
 		if( $useRename ) {
-			if( !rename( $tempName, $this->mSavedFile ) ) {
+			if( @!rename( $tempName, $this->mSavedFile ) ) {
 				$wgOut->fileCopyError( $tempName, $this->mSavedFile );
 				return false;
 			}
 		} else {
-			if( !move_uploaded_file( $tempName, $this->mSavedFile ) ) {
+			if( @!move_uploaded_file( $tempName, $this->mSavedFile ) ) {
 				$wgOut->fileCopyError( $tempName, $this->mSavedFile );
 				return false;
 			}
@@ -337,8 +337,7 @@ class UploadForm {
 	 * @access private
 	 */
 	function saveTempUploadedFile( $saveName, $tempName ) {
-		global $wgOut;
-
+		global $wgOut;		
 		$archive = wfImageArchiveDir( $saveName, 'temp' );
 		$stash = $archive . '/' . gmdate( "YmdHis" ) . '!' . $saveName;
 
@@ -359,7 +358,7 @@ class UploadForm {
 	 * @return int
 	 * @access private
 	 */
-	function stashSession() {
+	function stashSession() {		
 		$stash = $this->saveTempUploadedFile(
 			$this->mUploadSaveName, $this->mUploadTempName );
 
-- 
2.20.1