From: Helder.wiki <helder.wiki@gmail.com>
Date: Sat, 23 Aug 2014 23:11:01 +0000 (+0000)
Subject: Revert "Toolbar: Only show on WikiText pages"
X-Git-Tag: 1.31.0-rc.0~14202^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=a23f489f7d23d7732afa8141e236aaab2dfc4835;p=lhc%2Fweb%2Fwiklou.git

Revert "Toolbar: Only show on WikiText pages"

Classical toolbar no longer appears in Page namespace on Wikisources.

This reverts commit 7263ef1e002786b27fa06db43aa7a6fca00461fb.

Bug: 69447
Bug: 29908
Change-Id: Ifafe41f7bc91183e0db4c10d8340a8b620b380bc
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 84545b13f9..98e0ec4b5a 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2531,9 +2531,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() );
 		}