wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-24 00:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite recursion when checking for the new topic tool on empty pages

Browse source 
Bug: T312689
Change-Id: Iaf5033a55e3840ef65be0c4994f8b6c00fe2551b
This commit is contained in:
Ed Sanders 2022-07-09 12:48:17 +01:00
parent ddaf0d1084
commit f739160fb4
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/Hooks/HookUtils.php
View file

@ -230,7 +230,13 @@ class HookUtils {
*/ */
public static function isFeatureEnabledForOutput( OutputPage $output, ?string $feature = null ): bool { public static function isFeatureEnabledForOutput( OutputPage $output, ?string $feature = null ): bool {
// Only show on normal page views (not history etc.), and in edit mode for previews // Only show on normal page views (not history etc.), and in edit mode for previews
if ( !in_array( $output->getActionName(), [ 'view', 'edit', 'submit' ] ) ) { if (
// Don't try to call $output->getActionName if testing for NEWTOPICTOOL as we use
// the hook onGetActionName to override the action for the tool on empty pages.
// If we tried to call it here it would set up infinite recursion (T312689)
$feature !== static::NEWTOPICTOOL &&
!in_array( $output->getActionName(), [ 'view', 'edit', 'submit' ] )
) {
return false; return false;
} }