From be4522f420017be336a79de429726046484fc888 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 23 Mar 2009 19:05:28 +0000
Subject: [PATCH] * (bug 18116) 'edittools' is now output identically on edit
 and upload pages

---
 RELEASE-NOTES                       | 1 +
 includes/specials/SpecialUpload.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4bda39ec9a..ab11533782 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -282,6 +282,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17537) Disable bad zlib.output_compression output on HTTP 304 responses
 * (bug 11213) [edit] section links in printable version no longer appear when you cut-and-paste article text
 * (bug 17405) "Did you mean" to mirror Go/Search behavior of original request
+* (bug 18116) 'edittools' is now output identically on edit and upload pages
 
 == 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 7d28a38c3d..ab81e4fd2e 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1261,7 +1261,9 @@ wgUploadAutoFill = {$autofill};
 				<td></td>
 				<td class='mw-input'>"
 		);
-		$wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
+		$wgOut->addHTML( '<div class="mw-editTools">' );
+		$wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) );
+		$wgOut->addHTML( '</div>' );
 		$wgOut->addHTML( "
 				</td>
 			</tr>" .
-- 
2.20.1