http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76196
Revision: 76196 Author: reedy Date: 2010-11-06 16:11:19 +0000 (Sat, 06 Nov 2010) Log Message: ----------- Fixup fail from r76191. Thanks Nikerabbit Modified Paths: -------------- trunk/phase3/includes/api/ApiMain.php trunk/phase3/includes/api/ApiPageSet.php trunk/phase3/includes/api/ApiParse.php Modified: trunk/phase3/includes/api/ApiMain.php =================================================================== --- trunk/phase3/includes/api/ApiMain.php 2010-11-06 15:57:15 UTC (rev 76195) +++ trunk/phase3/includes/api/ApiMain.php 2010-11-06 16:11:19 UTC (rev 76196) @@ -833,7 +833,7 @@ $astriks = str_repeat( '*** ', 10 ); $msg .= "\n\n$astriks Modules $astriks\n\n"; - foreach ( $this->mModules as $moduleName ) { + foreach ( array_keys( $this->mModules ) as $moduleName ) { $module = new $this->mModules[$moduleName] ( $this, $moduleName ); $msg .= self::makeHelpMsgHeader( $module, 'action' ); $msg2 = $module->makeHelpMsg(); @@ -852,7 +852,7 @@ } $msg .= "\n$astriks Formats $astriks\n\n"; - foreach ( $this->mFormats as $formatName ) { + foreach ( array_keys( $this->mFormats ) as $formatName ) { $module = $this->createPrinterByName( $formatName ); $msg .= self::makeHelpMsgHeader( $module, 'format' ); $msg2 = $module->makeHelpMsg(); Modified: trunk/phase3/includes/api/ApiPageSet.php =================================================================== --- trunk/phase3/includes/api/ApiPageSet.php 2010-11-06 15:57:15 UTC (rev 76195) +++ trunk/phase3/includes/api/ApiPageSet.php 2010-11-06 16:11:19 UTC (rev 76196) @@ -501,7 +501,7 @@ if ( $processTitles ) { // The remaining titles in $remaining are non-existent pages foreach ( $remaining as $ns => $dbkeys ) { - foreach ( $dbkeys as $dbkey ) { + foreach ( array_keys( $dbkeys ) as $dbkey ) { $title = Title::makeTitle( $ns, $dbkey ); $this->mAllPages[$ns][$dbkey] = $this->mFakePageId; $this->mMissingTitles[$this->mFakePageId] = $title; Modified: trunk/phase3/includes/api/ApiParse.php =================================================================== --- trunk/phase3/includes/api/ApiParse.php 2010-11-06 15:57:15 UTC (rev 76195) +++ trunk/phase3/includes/api/ApiParse.php 2010-11-06 16:11:19 UTC (rev 76196) @@ -345,7 +345,7 @@ private function formatIWLinks( $iw ) { $result = array(); foreach ( $iw as $prefix => $titles ) { - foreach ( $titles as $title ) { + foreach ( array_keys( $titles ) as $title ) { $entry = array(); $entry['prefix'] = $prefix; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs