Merge "Toolbar: Only show on WikiText pages"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 50225cc..0a61a7e 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2524,7 +2524,9 @@ class EditPage {
 
                $wgOut->addHTML( $this->editFormTextBeforeContent );
 
-               if ( !$this->isCssJsSubpage && $showToolbar && $wgUser->getOption( 'showtoolbar' ) ) {
+               if ( $this->contentModel === CONTENT_MODEL_WIKITEXT &&
+                       $showToolbar && $wgUser->getOption( 'showtoolbar' ) )
+               {
                        $wgOut->addHTML( EditPage::getEditToolbar() );
                }