From c8fa10770aea4c115efb6011983bb1b487e348db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 18 Aug 2021 20:45:02 +0200 Subject: [PATCH] Remove remnants of the cookie hack for loading unavailable tools Follow-up to ee524d6bd655ed9fcdf55490812a0ab6580036f6. Change-Id: I1b4dc587e6b629b05ca0581dcd384a2bc7f01d2a --- extension.json | 1 - includes/CommentFormatter.php | 2 +- includes/Hooks/PageHooks.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/extension.json b/extension.json index f6805f49b..80cf40d86 100644 --- a/extension.json +++ b/extension.json @@ -86,7 +86,6 @@ "mediawiki.util", "mediawiki.storage", "mediawiki.String", - "mediawiki.cookie", "ext.visualEditor.core.utils.parsing" ], "messages": [ diff --git a/includes/CommentFormatter.php b/includes/CommentFormatter.php index c332e88d4..b1f93803e 100644 --- a/includes/CommentFormatter.php +++ b/includes/CommentFormatter.php @@ -45,7 +45,7 @@ class CommentFormatter { // Never add tools twice. // This is required because we try again to add tools to cached content - // to support query string or cookie enabling + // to support query string enabling. if ( strpos( $text, static::MARKER_COMMENT ) !== false ) { return; } diff --git a/includes/Hooks/PageHooks.php b/includes/Hooks/PageHooks.php index 7fb1c8320..b91d67151 100644 --- a/includes/Hooks/PageHooks.php +++ b/includes/Hooks/PageHooks.php @@ -145,7 +145,7 @@ class PageHooks implements public function onOutputPageBeforeHTML( $output, &$text ) { $lang = $output->getLanguage(); // Check after the parser cache if tools need to be added for - // non-cacheable reasons i.e. query string or cookie + // non-cacheable reasons (i.e. query string). // The addDiscussionTools method is responsible for ensuring that // tools aren't added twice. foreach ( CommentFormatter::USE_WITH_FEATURES as $feature ) {