http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75677
Revision: 75677
Author: reedy
Date: 2010-10-29 21:30:20 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Conditionals in loops to foreachs
Modified Paths:
--------------
trunk/extensions/AbuseFilter/AbuseFilter.hooks.php
trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php
trunk/extensions/AbuseFilter/ApiQueryAbuseFilters.php
trunk/extensions/AbuseFilter/ApiQueryAbuseLog.php
trunk/extensions/CategoryTree/CategoryTreeFunctions.php
trunk/extensions/CentralAuth/CentralAuthUser.php
trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
trunk/extensions/CentralAuth/SpecialGlobalUsers.php
trunk/extensions/CentralAuth/WikiSet.php
trunk/extensions/CheckUser/CheckUser_body.php
trunk/extensions/Collection/Collection.body.php
trunk/extensions/CommunityVoice/Modules/Ratings.php
trunk/extensions/ConfirmEdit/ConfirmEdit_body.php
trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
trunk/extensions/ContributionScores/ContributionScores_body.php
trunk/extensions/DynamicPageList/DPLMain.php
trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php
trunk/extensions/MWSearch/luceneUpdate.php
trunk/extensions/Nuke/Nuke_body.php
trunk/extensions/Oversight/HideRevision_body.php
trunk/extensions/ProofreadPage/ProofreadPage_body.php
trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
trunk/extensions/Renameuser/Renameuser_body.php
trunk/extensions/SpamBlacklist/SpamBlacklist_body.php
Modified: trunk/extensions/AbuseFilter/AbuseFilter.hooks.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.hooks.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/AbuseFilter/AbuseFilter.hooks.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -155,7 +155,7 @@
array( 'abuse_filter' => array( 'INNER JOIN',
'afa_filter=af_id' ) )
);
- while ( $row = $res->fetchObject() ) {
+ foreach ( $res as $row ) {
$emptyTags = array_filter(
array_merge( explode( "\n",
$row->afa_parameters ), $emptyTags )
);
Modified: trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php 2010-10-29
21:28:15 UTC (rev 75676)
+++ trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php 2010-10-29
21:30:20 UTC (rev 75677)
@@ -330,7 +330,7 @@
);
$users = array();
- while ( $user = $dbr->fetchRow( $res ) ) {
+ foreach ( $res as $user ) {
$users[] = $user[0];
}
$result = $users;
Modified: trunk/extensions/AbuseFilter/ApiQueryAbuseFilters.php
===================================================================
--- trunk/extensions/AbuseFilter/ApiQueryAbuseFilters.php 2010-10-29
21:28:15 UTC (rev 75676)
+++ trunk/extensions/AbuseFilter/ApiQueryAbuseFilters.php 2010-10-29
21:30:20 UTC (rev 75677)
@@ -97,7 +97,7 @@
$showhidden = $wgUser->isAllowed( 'abusefilter-modify' );
$count = 0;
- while ( $row = $res->fetchObject() ) {
+ foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've had enough
$this->setContinueEnumParameter( 'startid',
$row->af_id );
Modified: trunk/extensions/AbuseFilter/ApiQueryAbuseLog.php
===================================================================
--- trunk/extensions/AbuseFilter/ApiQueryAbuseLog.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/AbuseFilter/ApiQueryAbuseLog.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -104,7 +104,7 @@
$res = $this->select( __METHOD__ );
$count = 0;
- while ( $row = $res->fetchObject() ) {
+ foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've had enough
$this->setContinueEnumParameter( 'start',
wfTimestamp( TS_ISO_8601, $row->afl_timestamp ) );
Modified: trunk/extensions/CategoryTree/CategoryTreeFunctions.php
===================================================================
--- trunk/extensions/CategoryTree/CategoryTreeFunctions.php 2010-10-29
21:28:15 UTC (rev 75676)
+++ trunk/extensions/CategoryTree/CategoryTreeFunctions.php 2010-10-29
21:30:20 UTC (rev 75677)
@@ -524,7 +524,7 @@
$s = '';
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
# TODO: translation support; ideally added to Title
object
$t = Title::newFromRow( $row );
Modified: trunk/extensions/CentralAuth/CentralAuthUser.php
===================================================================
--- trunk/extensions/CentralAuth/CentralAuthUser.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/CentralAuth/CentralAuthUser.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -177,7 +177,7 @@
);
$sets = array();
- while ( $row = $dbr->fetchObject( $resSets ) ) {
+ foreach ( $resSets as $row ) {
$sets[$row->ggr_group] = WikiSet::newFromRow( $row );
}
@@ -185,7 +185,7 @@
$rights = array();
$groups = array();
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$set = @$sets[$row->ggp_group];
$rights[] = array( 'right' => $row->ggp_permission,
'set' => $set ? $set->getID() : false );
$groups[$row->ggp_group] = 1;
@@ -1314,7 +1314,7 @@
$result = $dbw->safeQuery( $sql, $this->mName );
$dbs = array();
- while ( $row = $dbw->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$dbs[] = $row->ln_wiki;
}
$dbw->freeResult( $result );
@@ -1432,7 +1432,7 @@
__METHOD__ );
$wikis = array();
- while ( $row = $result->fetchObject() ) {
+ foreach ( $result as $row ) {
$wikis[] = $row->lu_wiki;
}
$dbw->freeResult( $result );
@@ -1475,7 +1475,7 @@
__METHOD__ );
$wikis = array();
- while ( $row = $dbw->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$wikis[$row->lu_wiki] = array(
'wiki' => $row->lu_wiki,
'attachedTimestamp' => wfTimestampOrNull( TS_MW,
@@ -1859,8 +1859,9 @@
$groups = array();
- while ( $row = $dbr->fetchObject( $res ) )
+ foreach ( $res as $row ) {
$groups[] = $row->ggp_group;
+ }
return $groups;
}
@@ -1873,7 +1874,7 @@
$rights = array();
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$rights[] = $row->ggp_permission;
}
@@ -1894,8 +1895,9 @@
$rights = array();
- while ( $row = $dbr->fetchObject( $res ) )
+ foreach ( $res as $row ) {
$rights[] = $row->ggp_permission;
+ }
return $rights;
}
Modified: trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
===================================================================
--- trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
2010-10-29 21:28:15 UTC (rev 75676)
+++ trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
2010-10-29 21:30:20 UTC (rev 75677)
@@ -362,7 +362,7 @@
$res = $dbr->select( array( 'global_user_groups', 'globaluser'
), 'gu_name', array( 'gug_group' => $group, 'gu_id=gug_user' ), __METHOD__ );
// Invalidate their rights cache.
- while ( $row = $res->fetchObject() ) {
+ foreach ( $res as $row ) {
$cu = new CentralAuthUser( $row->gu_name );
$cu->quickInvalidateCache();
}
Modified: trunk/extensions/CentralAuth/SpecialGlobalUsers.php
===================================================================
--- trunk/extensions/CentralAuth/SpecialGlobalUsers.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/CentralAuth/SpecialGlobalUsers.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -124,7 +124,7 @@
$this->mResult->rewind();
- while ( $row = $this->mResult->fetchObject() ) {
+ foreach ( $this->mResult as $row ) {
$batch->addObj( Title::makeTitleSafe( NS_USER,
$row->gu_name ) );
}
$batch->execute();
@@ -141,7 +141,7 @@
}
$result = $this->mDb->select( 'global_user_groups',
'gug_group', array( 'gug_user' => $row->gu_id ), __METHOD__ );
$rights = array();
- while ( $row2 = $this->mDb->fetchObject( $result ) ) {
+ foreach ( $result as $row2 ) {
$rights[] = User::makeGroupLinkWiki( $row2->gug_group,
User::getGroupMember( $row2->gug_group ) );
}
return implode( ', ', $rights );
Modified: trunk/extensions/CentralAuth/WikiSet.php
===================================================================
--- trunk/extensions/CentralAuth/WikiSet.php 2010-10-29 21:28:15 UTC (rev
75676)
+++ trunk/extensions/CentralAuth/WikiSet.php 2010-10-29 21:30:20 UTC (rev
75677)
@@ -183,7 +183,7 @@
$dbr = CentralAuthUser::getCentralSlaveDB();
$res = $dbr->select( 'wikiset', '*', false, __METHOD__ );
$result = array();
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$result[] = self::newFromRow( $row );
}
return $result;
Modified: trunk/extensions/CheckUser/CheckUser_body.php
===================================================================
--- trunk/extensions/CheckUser/CheckUser_body.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/CheckUser/CheckUser_body.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -356,7 +356,7 @@
$blockip = SpecialPage::getTitleFor( 'Blockip' );
$ips_edits = array();
$counter = 0;
- while ( $row = $dbr->fetchObject( $ret ) ) {
+ foreach ( $ret as $row ) {
if ( $counter >= 5000 ) {
// FIXME: addWikiMSG
$wgOut->addHTML( wfMsgExt(
'checkuser-limited', array( 'parse' ) ) );
@@ -507,7 +507,7 @@
# List out each IP that has edits
$s = wfMsgExt( 'checkuser-too-many', array( 'parse' ) );
$s .= '<ol>';
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
if ( $counter >= 5000 ) {
// FIXME: addWikiMsg
$wgOut->addHTML( wfMsgExt(
'checkuser-limited', array( 'parse' ) ) );
@@ -556,7 +556,7 @@
$this->preCacheMessages();
# Try to optimize this query
$lb = new LinkBatch;
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
$userText = str_replace( ' ', '_',
$row->cuc_user_text );
$lb->add( $row->cuc_namespace, $row->cuc_title
);
$lb->add( NS_USER, $userText );
@@ -566,7 +566,7 @@
$ret->seek( 0 );
# List out the edits
$s = '<div id="checkuserresults">';
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
if ( $counter >= 5000 ) {
// FIXME: addWikiMsg
$wgOut->addHTML( wfMsgExt(
'checkuser-limited', array( 'parse' ) ) );
@@ -645,13 +645,13 @@
$ret = $dbr->query( $sql, __METHOD__ );
# Try to optimize this query
$lb = new LinkBatch;
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
$lb->add( $row->cuc_namespace, $row->cuc_title
);
}
$lb->execute();
$ret->seek( 0 );
$s = '';
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
if ( !$ip = htmlspecialchars( $row->cuc_ip ) ) {
continue;
}
@@ -686,14 +686,14 @@
} else {
# Try to optimize this query
$lb = new LinkBatch;
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
$lb->add( $row->cuc_namespace, $row->cuc_title
);
}
$lb->execute();
$ret->seek( 0 );
# List out the edits
$s = '<div id="checkuserresults">';
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
$s .= $this->CUChangesLine( $row, $reason );
}
$s .= '</ul></div>';
@@ -769,7 +769,7 @@
$s = '<h5>' . wfMsg( 'checkuser-too-many' ) . '</h5>';
$s .= '<ol>';
$counter = 0;
- while ( $row = $ret->fetchObject() ) {
+ foreach ( $ret as $row ) {
if ( $counter >= 5000 ) {
$wgOut->addHTML( wfMsgExt(
'checkuser-limited', array( 'parse' ) ) );
break;
Modified: trunk/extensions/Collection/Collection.body.php
===================================================================
--- trunk/extensions/Collection/Collection.body.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/Collection/Collection.body.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -694,7 +694,7 @@
$count = 0;
$limitExceeded = false;
- while ( $row = $db->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
if ( ++$count > $limit ) {
$limitExceeded = true;
break;
Modified: trunk/extensions/CommunityVoice/Modules/Ratings.php
===================================================================
--- trunk/extensions/CommunityVoice/Modules/Ratings.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/CommunityVoice/Modules/Ratings.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -40,7 +40,7 @@
array( 'vot_category' => $category )
);
$titles = array();
- while ( $row = $result->fetchRow() ) {
+ foreach ( $result as $row ) {
$titles[] = (string)$row['vot_title'];
}
return $titles;
Modified: trunk/extensions/ConfirmEdit/ConfirmEdit_body.php
===================================================================
--- trunk/extensions/ConfirmEdit/ConfirmEdit_body.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/ConfirmEdit/ConfirmEdit_body.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -484,7 +484,7 @@
$res = $dbr->select( 'externallinks', array( 'el_to' ),
array( 'el_from' => $id ), __METHOD__ );
$links = array();
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$links[] = $row->el_to;
}
return $links;
Modified: trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
===================================================================
--- trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
2010-10-29 21:28:15 UTC (rev 75676)
+++ trunk/extensions/ContributionReporting/FundraiserStatistics_body.php
2010-10-29 21:30:20 UTC (rev 75677)
@@ -244,7 +244,7 @@
);
$result = array();
$ytd = 0;
- while ( $row = $dbr->fetchRow( $select ) ) {
+ foreach ( $select as $row ) {
$row[] = $ytd += $row[1]; // YTD
$result[] = $row;
}
Modified: trunk/extensions/ContributionScores/ContributionScores_body.php
===================================================================
--- trunk/extensions/ContributionScores/ContributionScores_body.php
2010-10-29 21:28:15 UTC (rev 75676)
+++ trunk/extensions/ContributionScores/ContributionScores_body.php
2010-10-29 21:30:20 UTC (rev 75677)
@@ -102,7 +102,7 @@
$skin = $wgUser->getSkin();
$altrow = '';
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$output .= "</tr><tr class='{$altrow}'>\n<td
class='content'>" .
round($row->wiki_rank,0) . "\n</td><td
class='content'>" .
$row->page_count . "\n</td><td
class='content'>" .
Modified: trunk/extensions/DynamicPageList/DPLMain.php
===================================================================
--- trunk/extensions/DynamicPageList/DPLMain.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/DynamicPageList/DPLMain.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -2947,7 +2947,7 @@
$lastNamespaceFound = '';
$lastTitleFound = '';
- while ( $row = $dbr->fetchObject ( $res ) ) {
+ foreach ( $res as $row ) {
$iArticle++;
// in random mode skip articles which were not chosen
@@ -3426,7 +3426,7 @@
. str_replace( ' ', '_', $cat ) . "'" . " WHERE
page_namespace='14'",
__METHOD__
);
- while ( $row = $dbr->fetchObject ( $res ) ) {
+ foreach ( $res as $row ) {
if ( $depth > 1 ) {
$cats .= '|' . self::getSubcategories(
$row->page_title, $sPageTable, $depth - 1 );
} else {
Modified: trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php
===================================================================
--- trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php 2010-10-29
21:28:15 UTC (rev 75676)
+++ trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php 2010-10-29
21:30:20 UTC (rev 75677)
@@ -104,8 +104,7 @@
$res = $this->select(__METHOD__);
$count = 0;
- while($row = $res->fetchObject())
- {
+ foreach ( $res as $row ) {
if(++$count > $params['limit'])
{
// We've had enough
Modified: trunk/extensions/MWSearch/luceneUpdate.php
===================================================================
--- trunk/extensions/MWSearch/luceneUpdate.php 2010-10-29 21:28:15 UTC (rev
75676)
+++ trunk/extensions/MWSearch/luceneUpdate.php 2010-10-29 21:30:20 UTC (rev
75677)
@@ -240,7 +240,7 @@
$limit );
$errorCount = 0;
- while( $row = $this->dbstream->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$this->progress();
$title = Title::makeTitle( $row->page_namespace,
$row->page_title );
@@ -304,7 +304,7 @@
$this->init( $max );
$lastError = true;
- while( $row = $this->dbstream->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$this->progress();
$title = Title::makeTitle( $row->log_namespace,
$row->log_title );
$hit = MWSearchUpdater::deletePage( $wgDBname, $title );
@@ -358,7 +358,7 @@
$this->init( $max );
$lastError = true;
- while( $row = $this->dbstream->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$this->progress();
$rev = new Revision( $row );
if( is_object( $rev ) ) {
Modified: trunk/extensions/Nuke/Nuke_body.php
===================================================================
--- trunk/extensions/Nuke/Nuke_body.php 2010-10-29 21:28:15 UTC (rev 75676)
+++ trunk/extensions/Nuke/Nuke_body.php 2010-10-29 21:30:20 UTC (rev 75677)
@@ -130,7 +130,7 @@
)
);
$pages = array();
- while( $row = $dbr->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$pages[] = array( Title::makeTitle( $row->rc_namespace,
$row->rc_title ), $row->edits );
}
$dbr->freeResult( $result );
Modified: trunk/extensions/Oversight/HideRevision_body.php
===================================================================
--- trunk/extensions/Oversight/HideRevision_body.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/Oversight/HideRevision_body.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -131,7 +131,7 @@
$changes = ChangesList::newFromUser( $wgUser );
$out = $changes->beginRecentChangesList();
- while( $row = $resultSet->fetchObject() ) {
+ foreach ( $resultSet as $row ) {
$rc = RecentChange::newFromCurRow( $row );
$rc->counter = 0; // ???
$out .= $changes->recentChangesLine( $rc );
@@ -488,7 +488,7 @@
$dbr = wfGetDB( DB_SLAVE );
$result = $this->getRevisions( $dbr, array( 'hidden_rev_id' =>
$revision ) );
- while( $row = $dbr->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$info = $this->listRow( $row );
$list = $this->revisionInfo( $row );
$rev = new Revision( $row );
@@ -534,7 +534,7 @@
$dbr = wfGetDB( DB_SLAVE );
$result = $this->getRevisions( $dbr, array( 'hidden_rev_id' =>
$revision ) );
- while( $row = $dbr->fetchObject( $result ) ) {
+ foreach ( $result as $row ) {
$info = $this->listRow( $row );
$list = $this->revisionInfo( $row );
$rev = new Revision( $row );
@@ -643,7 +643,7 @@
wfProfileIn( __METHOD__ );
# Do a link batch query
$lb = new LinkBatch();
- while( $row = $this->mResult->fetchObject() ) {
+ foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
Modified: trunk/extensions/ProofreadPage/ProofreadPage_body.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage_body.php 2010-10-29
21:28:15 UTC (rev 75676)
+++ trunk/extensions/ProofreadPage/ProofreadPage_body.php 2010-10-29
21:30:20 UTC (rev 75677)
@@ -152,7 +152,7 @@
__METHOD__
);
- while ( $x = $dbr->fetchObject( $result ) ) {
+ foreach ( $result as $x ) {
$ref_title = Title::makeTitle( $x->page_namespace,
$x->page_title );
if ( preg_match( "/^$index_namespace:(.*)$/",
$ref_title->getPrefixedText() ) ) {
$title->pr_index_title =
$ref_title->getPrefixedText();
@@ -488,7 +488,7 @@
$query .= ')';
$res = $dbr->query( $query, __METHOD__ );
- while ( $x = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $x ) {
$pdbk = $page_ids[$x->cl_from];
switch( $x->cl_to ) {
case str_replace( ' ' , '_' , wfMsgForContent(
'proofreadpage_quality0_category' ) ):
@@ -882,7 +882,7 @@
);
if( $res ) {
- while( $o = $dbr->fetchObject( $res ) )
{
+ foreach ( $res as $o ) {
array_push( $q0_pages,
$o->page_title );
}
}
Modified: trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
===================================================================
--- trunk/extensions/ReaderFeedback/ReaderFeedback.class.php 2010-10-29
21:28:15 UTC (rev 75676)
+++ trunk/extensions/ReaderFeedback/ReaderFeedback.class.php 2010-10-29
21:30:20 UTC (rev 75677)
@@ -208,7 +208,7 @@
$votes[$tag] = array( 0 => 0, 1 => 0, 2 => 0, 3
=> 0, 4 => 0 );
}
// Read votes and tally the numbers
- while( $row = $dbr->fetchObject($res) ) {
+ foreach ( $res as $row ) {
$dims = ReaderFeedback::expandRatings(
$row->rfb_ratings );
foreach( $dims as $tag => $val ) {
if( isset($votes[$tag]) &&
isset($votes[$tag][$val]) ) {
Modified: trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
===================================================================
--- trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2010-10-29 21:28:15 UTC (rev 75676)
+++ trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2010-10-29 21:30:20 UTC (rev 75677)
@@ -155,7 +155,7 @@
wfProfileIn( __METHOD__ );
# Do a link batch query...
$lb = new LinkBatch();
- while( $row = $this->mResult->fetchObject() ) {
+ foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
Modified: trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
===================================================================
--- trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
2010-10-29 21:28:15 UTC (rev 75676)
+++ trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
2010-10-29 21:30:20 UTC (rev 75677)
@@ -216,7 +216,7 @@
// Label spacing
$int = intval( ceil($days/10) ); // 10 labels at most
$dates = $drating = $arating = $dcount = "";
- while( $row = $res->fetchObject() ) {
+ foreach ( $res as $row ) {
$totalVal += (int)$row->rfh_total;
$totalCount += (int)$row->rfh_count;
$dayAve = sprintf( '%4.2f',
(real)$row->rfh_total/(real)$row->rfh_count );
@@ -386,7 +386,7 @@
if( !$maxC ) return false;
// Label spacing
$int = intval( ceil($days/10) ); // 10 labels at most
- while( $row = $res->fetchObject() ) {
+ foreach ( $res as $row ) {
$totalVal += (int)$row->rfh_total;
$totalCount += (int)$row->rfh_count;
$dayCount = (real)$row->rfh_count;
@@ -521,7 +521,7 @@
# Get max count and average rating
$total = $count = $ave = $maxC = $days = 0;
if( $dbr->numRows($res) > 0 ) {
- while( $row = $dbr->fetchObject($res) ) {
+ foreach ( $res as $row ) {
if( !isset($lower) ) {
$lower = wfTimestamp( TS_UNIX,
$row->rfh_date ); // first day
}
@@ -648,7 +648,7 @@
$columns = 4;
$count = 0;
$html = "<table class='rfb-reader_feedback_users'><tr>";
- while( $row = $res->fetchObject() ) {
+ foreach ( $res as $row ) {
$title = Title::makeTitleSafe( NS_USER, $row->name );
if( is_null($title) ) continue; // bad IP?
$html .= '<td>'.$this->skin->makeLinkObj( $title,
$title->getText() )." [{$row->n}]</td>";
Modified: trunk/extensions/Renameuser/Renameuser_body.php
===================================================================
--- trunk/extensions/Renameuser/Renameuser_body.php 2010-10-29 21:28:15 UTC
(rev 75676)
+++ trunk/extensions/Renameuser/Renameuser_body.php 2010-10-29 21:30:20 UTC
(rev 75677)
@@ -311,7 +311,7 @@
$output = '';
$skin = $wgUser->getSkin();
- while ( $row = $dbr->fetchObject( $pages ) ) {
+ foreach ( $pages as $row ) {
$oldPage = Title::makeTitleSafe(
$row->page_namespace, $row->page_title );
$newPage = Title::makeTitleSafe(
$row->page_namespace,
preg_replace( '!^[^/]+!',
$newusername->getDBkey(), $row->page_title ) );
Modified: trunk/extensions/SpamBlacklist/SpamBlacklist_body.php
===================================================================
--- trunk/extensions/SpamBlacklist/SpamBlacklist_body.php 2010-10-29
21:28:15 UTC (rev 75676)
+++ trunk/extensions/SpamBlacklist/SpamBlacklist_body.php 2010-10-29
21:30:20 UTC (rev 75677)
@@ -287,7 +287,7 @@
$res = $dbr->select( 'externallinks', array( 'el_to' ),
array( 'el_from' => $id ), __METHOD__ );
$links = array();
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$links[] = $row->el_to;
}
return $links;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
