From 0c0477d03fb225ded272d8a42f1d225750e6aae4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Fri, 25 May 2018 00:54:14 +0200 Subject: [PATCH] EditPage: Fix duplicate classic toolbar Caused by an incorrectly resolved rebase conflict between 14cffee7c1ea7e6f411730a52aadb2458fcfb0fd and 70941efd35562dcb7003229b56c91a98a67de7a9. Bug: T195517 Change-Id: I294acff48fe9b1a1a9384d717f09d90e417204ab --- includes/EditPage.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 = '
'; 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 ) ); }; -- 2.20.1