From 1ab8b2907c1205446a5d434a248108920272259e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taavi=20V=C3=A4=C3=A4n=C3=A4nen?= Date: Fri, 3 Apr 2026 01:00:17 +0300 Subject: [PATCH] Actions: Fix incorrect variable shadowing When the original fix for T419192 was submitted to Gerrit to be released, a "$request = $context->getRequest();" line was added to resolve some CI issue. Unfortunately this overrides $request from earlier context, which renders the original fix ineffective. Fix that by using an another variable name. Bug: T419192 Change-Id: I2a6b57cc3d2d325e1f526b1a988d98e401c4c36d --- includes/Actions/ActionEntryPoint.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/Actions/ActionEntryPoint.php b/includes/Actions/ActionEntryPoint.php index 0bfcb31c162..11202ef2e42 100644 --- a/includes/Actions/ActionEntryPoint.php +++ b/includes/Actions/ActionEntryPoint.php @@ -517,9 +517,9 @@ class ActionEntryPoint extends MediaWikiEntryPoint { } } - $request = $context->getRequest(); - if ( $request instanceof FauxRequest ) { - $fauxResponse = $request->response(); + $contextRequest = $context->getRequest(); + if ( $contextRequest instanceof FauxRequest ) { + $fauxResponse = $contextRequest->response(); if ( $fauxResponse->getStatusCode() ) { $request->response()->statusHeader( $fauxResponse->getStatusCode() ); } -- 2.53.0