From 711e50b0e5603b834a0a225c263ce5fcd34de2bd Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Mon, 26 Oct 2009 16:54:57 +0000
Subject: [PATCH] Follow-up to r57868: Add edit.js unconditionally like
 EditPage does. This will probably unbreak edittools in js2 mode.

---
 includes/specials/SpecialUpload.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 7da76af142..4dcedb2517 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -904,14 +904,16 @@ class UploadForm extends HTMLForm {
 		);
 
 		$wgOut->addScript( Skin::makeVariablesScript( $scriptVars ) );
-
+		
+		// For <charinsert> support; not provided by js2 yet
+		$wgOut->addScriptFile( 'edit.js' );
+		
 		if ( $wgEnableJS2system ) {
-			//js2version of upload page:
+			// JS2 upload scripts
 			$wgOut->addScriptClass( 'uploadPage' );
 		} else {
-			//legacy upload code:
+			// Legacy upload javascript
 			$wgOut->addScriptFile( 'upload.js' );
-			$wgOut->addScriptFile( 'edit.js' ); // For <charinsert> support
 		}
 	}
 
-- 
2.20.1