From efa16d716567018158d233a98bc94938b1dc8e50 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Mon, 6 Jun 2011 15:58:55 +0000 Subject: [PATCH] Fix fixme on r89549 --- includes/api/ApiPageSet.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php index 3b49647852..4718221db9 100644 --- a/includes/api/ApiPageSet.php +++ b/includes/api/ApiPageSet.php @@ -451,6 +451,7 @@ class ApiPageSet extends ApiQueryBase { $pageids = self::getPositiveIntegers( $pageids ); + $res = null; if ( count( $pageids ) ) { $set = array( 'page_id' => $pageids @@ -485,20 +486,22 @@ class ApiPageSet extends ApiQueryBase { ApiBase::dieDebug( __METHOD__, 'Missing $processTitles parameter when $remaining is provided' ); } - foreach ( $res as $row ) { - $pageId = intval( $row->page_id ); - - // Remove found page from the list of remaining items - if ( isset( $remaining ) ) { - if ( $processTitles ) { - unset( $remaining[$row->page_namespace][$row->page_title] ); - } else { - unset( $remaining[$pageId] ); + if ( $res ) { + foreach ( $res as $row ) { + $pageId = intval( $row->page_id ); + + // Remove found page from the list of remaining items + if ( isset( $remaining ) ) { + if ( $processTitles ) { + unset( $remaining[$row->page_namespace][$row->page_title] ); + } else { + unset( $remaining[$pageId] ); + } } - } - // Store any extra fields requested by modules - $this->processDbRow( $row ); + // Store any extra fields requested by modules + $this->processDbRow( $row ); + } } if ( isset( $remaining ) ) { -- 2.20.1