From c9c7e2e1ce2eeff68af47ffb5207716314363da1 Mon Sep 17 00:00:00 2001 From: DannyS712 Date: Tue, 17 Dec 2019 06:22:57 +0000 Subject: [PATCH] NewPagesPager: Fix namespace query conditions Bug: T240924 Change-Id: I28d276cae0518386cac3f9d571ba09e9eff6678b (cherry picked from commit b390ef6e5825e8906667d7a755d70b3478ce47b7) --- includes/specials/pagers/NewPagesPager.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/includes/specials/pagers/NewPagesPager.php b/includes/specials/pagers/NewPagesPager.php index c50563d7cd..95f67d59b8 100644 --- a/includes/specials/pagers/NewPagesPager.php +++ b/includes/specials/pagers/NewPagesPager.php @@ -139,15 +139,18 @@ class NewPagesPager extends ReverseChronologicalPager { $eq_op = $invert ? '!=' : '='; $bool_op = $invert ? 'AND' : 'OR'; + $selectedNS = $this->mDb->addQuotes( $namespace ); if ( !$associated ) { - return [ "rc_namespace $eq_op " . $this->mDb->addQuotes( $namespace ) ]; + return [ "rc_namespace $eq_op $selectedNS" ]; } - $associatedNS = MediaWikiServices::getInstance()->getNamespaceInfo()->getAssociated( $namespace ); + $associatedNS = $this->mDb->addQuotes( + MediaWikiServices::getInstance()->getNamespaceInfo()->getAssociated( $namespace ) + ); return [ - "rc_namespace $eq_op " . $this->mDb->addQuotes( $namespace ) . + "rc_namespace $eq_op $selectedNS " . $bool_op . - " rc_namespace $eq_op " . $this->mDb->addQuotes( $associatedNS ) + " rc_namespace $eq_op $associatedNS" ]; } -- 2.20.1