From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 1 Sep 2014 14:07:01 +0000 (+0000)
Subject: Merge "Revert "Toolbar: Only show on WikiText pages""
X-Git-Tag: 1.31.0-rc.0~14202
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=d78b4eeff8cdf47ba6f5da1257c4a6e9de688316;hp=dff0e15bbfac25319f5fe01f148b25902884f882;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a93e975cfd..a14191a035 100644
--- 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() );
 		}