Merge "Revert "Toolbar: Only show on WikiText pages""

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