From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 1 Jul 2007 21:50:33 +0000 (+0000)
Subject: Respect $wgUseAjax
X-Git-Tag: 1.31.0-rc.0~52296
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=3f5e1361a49abd4138a887bc10747f4f23fb2900;p=lhc%2Fweb%2Fwiklou.git

Respect $wgUseAjax
---

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 85579f3cb3..a187f65d3b 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -712,13 +712,15 @@ class UploadForm {
 	 */
 	function mainUploadForm( $msg='' ) {
 		global $wgOut, $wgUser;
-		global $wgUseCopyrightUpload, $wgAjaxUploadDestCheck;
+		global $wgUseCopyrightUpload, $wgAjaxUploadDestCheck, $wgUseAjax;
 		global $wgRequest, $wgAllowCopyUploads, $wgEnableAPI;
 		global $wgStylePath;
 
+		$useAjax = $wgAjaxUploadDestCheck && $wgUseAjax;
+
 		$wgOut->addScript( 
 			"<script type='text/javascript'>wgAjaxUploadDestCheck = " . 
-				($wgAjaxUploadDestCheck ? 'true' : 'false' ) . ";</script>\n" . 
+				($useAjax ? 'true' : 'false' ) . ";</script>\n" . 
 			"<script type='text/javascript' src=\"$wgStylePath/common/upload.js?1\"></script>\n" 
 	   	);
 
@@ -792,7 +794,7 @@ class UploadForm {
 				"size='40' />" .
 				"<input type='hidden' name='wpSourceType' value='file' />" ;
 		}
-		if ( $wgAjaxUploadDestCheck ) {
+		if ( $useAjax ) {
 			$warningRow = "<tr><td colspan='2' id='wpDestFile-warning'>&nbsp</td></tr>";
 			$destOnkeyup = 'onkeyup="wgUploadWarningObj.keypress();"';
 		} else {