From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Wed, 22 Sep 2010 18:03:29 +0000 (+0000)
Subject: Fixed check for mediaWiki existance and removed additional unneeded wrapping in media... 
X-Git-Tag: 1.31.0-rc.0~34835
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=fd5ad32869773a71f641e30f4633765699403eaf;p=lhc%2Fweb%2Fwiklou.git

Fixed check for mediaWiki existance and removed additional unneeded wrapping in mediaWiki.loader.using calls as per comments on r73499.
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f027ba6bdf..50d97fde5b 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2246,7 +2246,7 @@ HTML
 		}
 		
 		$wgOut->addScript( Html::inlineScript(
-			"if ( mediaWiki !== undefined ) { $script }"
+			"if ( window.mediaWiki ) { $script }"
 		) );
 		
 		$toolbar .= "\n</div>";
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 9dc9baffdd..4a9c25e21f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2381,7 +2381,7 @@ class OutputPage {
 		if ( $this->getModules() ) {
 			$modules = FormatJson::encode( $this->getModules() );
 			$scripts .= Html::inlineScript(
-				"if ( mediaWiki !== undefined ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
+				"if ( window.mediaWiki ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
 			) . "\n";
 		}
 		
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 807cdc2f71..3272cfef13 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -592,7 +592,7 @@ class ProtectionForm {
 		$encOptions = Xml::encodeJsVar( $options );
 
 		$script .= "ProtectionForm.init($encOptions)";
-		return Html::inlineScript( "if ( mediaWiki !== undefined ) { mediaWiki.loader.using( 'mediawiki.legacy.protect', function() { {$script} } ); }" );
+		return Html::inlineScript( "if ( window.mediaWiki ) { $script }" );
 	}
 
 	/**