From eba44727d58f37dc82ea5cb9c582e5f8b09761af Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 1 Apr 2004 12:43:40 +0000
Subject: [PATCH] fixing notices and syncing with refactoring in Article.php

---
 includes/ImagePage.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 902a0c5ade..dab95ac902 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -35,12 +35,12 @@ class ImagePage extends Article {
 			list($width, $height, $type, $attr) = getimagesize( $path );
 
 			$sk = $wgUser->getSkin();
-
+			
 			if ( $type != "" ) {
 				# image
-				$s .= "<center><img src=\"{$url}\" width=\"{$width}\" height=\"{$height}\"></center>";
+				$s = "<center><img src=\"{$url}\" width=\"{$width}\" height=\"{$height}\"></center>";
 			} else {
-				$s .= "<center>".$sk->makeMediaLink($name,"")."</center>";
+				$s = "<center>".$sk->makeMediaLink($name,"")."</center>";
 			}
 			$wgOut->addHTML( $s );
 		}
@@ -152,8 +152,10 @@ class ImagePage extends Article {
 			$q = "&image={$image}";
 		} else if ( !is_null( $oldimage ) ) {
 			$q = "&oldimage={$oldimage}";
+		} else {
+			$q = "";
 		}
-		return $this->confirmDelete( $q );
+		return $this->confirmDelete( $q, $wgRequest->getText( 'wpReason' ) );
 	}
 
 	function doDelete()
@@ -169,7 +171,7 @@ class ImagePage extends Article {
 		if ( !is_null( $image ) ) {
 			$dest = wfImageDir( $image );
 			$archive = wfImageDir( $image );
-			if ( ! unlink( "{$dest}/{$image}" ) ) {
+			if ( ! @unlink( "{$dest}/{$image}" ) ) {
 				$wgOut->fileDeleteError( "{$dest}/{$image}" );
 				return;
 			}
-- 
2.20.1