From: Mwalker <mwalker@wikimedia.org>
Date: Tue, 29 Jul 2014 16:52:51 +0000 (+0000)
Subject: Merge "Toolbar: Only show on WikiText pages"
X-Git-Tag: 1.31.0-rc.0~14693
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=b88d4628dcde8babb4990fc4f622673e3f275650;hp=d9ec6b146bd6381cb28c733b6d20ca4683e77d46;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 50225ccc65..0a61a7ed1e 100644
--- 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() );
 		}