Fixed check for mediaWiki existance and removed additional unneeded wrapping in media...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f027ba6..50d97fd 100644 (file)
--- 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 9dc9baf..4a9c25e 100644 (file)
--- 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 807cdc2..3272cfe 100644 (file)
--- 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 }" );
        }
 
        /**