From 145ee9cc9c257c1c6a397f61c408dcaf13a9f869 Mon Sep 17 00:00:00 2001
From: X! <soxred93@users.mediawiki.org>
Date: Fri, 27 Feb 2009 20:27:51 +0000
Subject: [PATCH] (bug 17707) Show file destination as plain text if
 &wpForReUpload=1

---
 RELEASE-NOTES                       |  1 +
 includes/specials/SpecialUpload.php | 29 ++++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index acd1175e77..e67e277f64 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -226,6 +226,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17648) Prevent floats from intruding into edit area in previews if no toolbar present
 * (bug 16899) DISPLAYTITLE should allow Arabic and Persian harakats
 * (bug 17692) Added (list of members) link to 'user' in Special:Listgrouprights
+* (bug 17707) Show file destination as plain text if &wpForReUpload=1
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 2d4b7f98f7..8849b552ed 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1121,10 +1121,8 @@ wgUploadAutoFill = {$autofill};
 			$warningRow = '';
 			$destOnkeyup = '';
 		}
-		# Uploading a new version? If so, the name is fixed.
-		$on = $this->mForReUpload ? "readonly='readonly'" : "";
-
 		$encComment = htmlspecialchars( $this->mComment );
+		
 
 		$wgOut->addHTML(
 			 Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL(),
@@ -1152,10 +1150,27 @@ wgUploadAutoFill = {$autofill};
 				<td class='mw-label'>
 					<label for='wpDestFile'>{$destfilename}</label>
 				</td>
-				<td class='mw-input'>
-					<input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='60'
-						value=\"{$encDestName}\" onchange='toggleFilenameFiller()' $on $destOnkeyup />
-				</td>
+				<td class='mw-input'>"
+		);
+		if( $this->mForReUpload ) {
+			$wgOut->addHTML(
+				"<input tabindex='2' type='hidden' name='wpDestFile' id='wpDestFile' 
+					value='{$encDestName}' />" . 
+				"<tt>" .
+				$encDestName .
+				"</tt>"
+			);
+		}
+		else {
+			$wgOut->addHTML(
+				"<input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='60'
+						value='{$encDestName}' onchange='toggleFilenameFiller()' $destOnkeyup />"
+			);
+		}
+		
+
+		$wgOut->addHTML(
+				"</td>
 			</tr>
 			<tr>
 				<td class='mw-label'>
-- 
2.20.1