Fix fixme on r89549
authorSam Reed <reedy@users.mediawiki.org>
Mon, 6 Jun 2011 15:58:55 +0000 (15:58 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Mon, 6 Jun 2011 15:58:55 +0000 (15:58 +0000)
includes/api/ApiPageSet.php

index 3b49647..4718221 100644 (file)
@@ -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 ) ) {