From e352f39fc3e7928da2270d98477d65ca790e1985 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Mon, 14 Oct 2024 15:47:23 +0100
Subject: [PATCH] SpecialLintErrors: Reduce code always run in findNamespace

Array filtering/manipulation is only useful if wpNamespaceRestrictions is set and a useable value,
so only manipulate canonical namespace list if we're going to use it

Change-Id: Ib6d0884f396ca6e0b32817d9b4b90a0de36ba707
---
 includes/SpecialLintErrors.php | 37 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/includes/SpecialLintErrors.php b/includes/SpecialLintErrors.php
index cf0aa22f..c4fb5826 100644
--- a/includes/SpecialLintErrors.php
+++ b/includes/SpecialLintErrors.php
@@ -198,25 +198,26 @@ class SpecialLintErrors extends SpecialPage {
 	 * @return array
 	 */
 	protected function findNamespaces( $request ) {
-		$namespaces = [];
-		$activeNamespaces = array_keys(
-			$this->namespaceInfo->getCanonicalNamespaces()
-		);
-		// Remove -2 = "media" and -1 = "Special" namespace elements
-		$activeNamespaces = array_filter( $activeNamespaces,
-			static function ( $x ) {
-				return $x >= 0;
-			}
-		);
-		if ( $request->getCheck( 'wpNamespaceRestrictions' ) ) {
-			$namespaceRequestValues = $request->getRawVal( 'wpNamespaceRestrictions' ) ?? '';
-			if ( $namespaceRequestValues !== '' ) {
-				$namespaceIDs = array_map( 'intval', explode( "\n", $namespaceRequestValues ) );
-				// Security measure: only allow active namespace IDs to reach the query
-				$namespaces = array_values( array_intersect( $activeNamespaces, $namespaceIDs ) );
-			}
+		$namespaceRequestValues = $request->getRawVal( 'wpNamespaceRestrictions' ) ?? '';
+		if ( $namespaceRequestValues === '' ) {
+			return [];
 		}
-		return $namespaces;
+
+		// Security measure: only allow active namespace IDs to reach the query
+		return array_values(
+			array_intersect(
+				// Remove -2 = "media" and -1 = "Special" namespace elements
+				array_filter(
+					array_keys(
+						$this->namespaceInfo->getCanonicalNamespaces()
+					),
+					static function ( $x ) {
+						return $x >= 0;
+					}
+				),
+				array_map( 'intval', explode( "\n", $namespaceRequestValues ) )
+			)
+		);
 	}
 
 	/**