Merge "EditPage: Fix duplicate classic toolbar"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 67ce1f3..87fb711 100644 (file)
--- 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 ) );
                };