From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Thu, 24 May 2018 22:54:14 +0000 (+0200)
Subject: EditPage: Fix duplicate classic toolbar
X-Git-Tag: 1.34.0-rc.0~5304^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=0c0477d03fb225ded272d8a42f1d225750e6aae4;p=lhc%2Fweb%2Fwiklou.git

EditPage: Fix duplicate classic toolbar

Caused by an incorrectly resolved rebase conflict
between 14cffee7c1ea7e6f411730a52aadb2458fcfb0fd
and 70941efd35562dcb7003229b56c91a98a67de7a9.

Bug: T195517
Change-Id: I294acff48fe9b1a1a9384d717f09d90e417204ab
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 67ce1f3c11..87fb711138 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4111,14 +4111,12 @@ ERROR;
 
 		$script .= '});';
 
-		$nonce = $wgOut->getCSPNonce();
-		$wgOut->addScript( ResourceLoader::makeInlineScript( $script, $nonce ) );
-
 		$toolbar = '<div id="toolbar"></div>';
 
 		if ( Hooks::run( 'EditPageBeforeEditToolbar', [ &$toolbar ] ) ) {
 			// Only add the old toolbar cruft to the page payload if the toolbar has not
 			// been over-written by a hook caller
+			$nonce = $wgOut->getCSPNonce();
 			$wgOut->addScript( ResourceLoader::makeInlineScript( $script, $nonce ) );
 		};