http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75647
Revision: 75647
Author: reedy
Date: 2010-10-29 16:06:20 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Fixup some while to foreach. Remove an unused global
Modified Paths:
--------------
trunk/extensions/AntiSpoof/SpoofUser.php
trunk/extensions/AntiSpoof/batchAntiSpoof.php
trunk/extensions/CentralAuth/migratePass0.php
trunk/extensions/CentralAuth/migratePass1.php
trunk/extensions/CentralAuth/migrateStewards.php
trunk/extensions/CheckUser/install.inc
trunk/extensions/CommunityVoice/Modules/Ratings.php
trunk/extensions/ProofreadPage/SpecialPagesWithoutScans.php
Modified: trunk/extensions/AntiSpoof/SpoofUser.php
===================================================================
--- trunk/extensions/AntiSpoof/SpoofUser.php 2010-10-29 15:32:44 UTC (rev
75646)
+++ trunk/extensions/AntiSpoof/SpoofUser.php 2010-10-29 16:06:20 UTC (rev
75647)
@@ -59,7 +59,7 @@
) );
$spoofs = array();
- while ( $row = $dbr->fetchObject( $spoofedUsers ) ) {
+ foreach ( $spoofedUsers as $row ) {
array_push( $spoofs, $row->user_name );
}
return $spoofs;
Modified: trunk/extensions/AntiSpoof/batchAntiSpoof.php
===================================================================
--- trunk/extensions/AntiSpoof/batchAntiSpoof.php 2010-10-29 15:32:44 UTC
(rev 75646)
+++ trunk/extensions/AntiSpoof/batchAntiSpoof.php 2010-10-29 16:06:20 UTC
(rev 75647)
@@ -12,7 +12,7 @@
$result = $dbw->select( 'user', 'user_name', null, 'batchAntiSpoof.php' );
$n = 0;
-while ( $row = $dbw->fetchObject( $result ) ) {
+foreach( $res as $row ) {
if ( $n++ % $batchSize == 0 ) {
echo "$wgDBname $n\n";
}
Modified: trunk/extensions/CentralAuth/migratePass0.php
===================================================================
--- trunk/extensions/CentralAuth/migratePass0.php 2010-10-29 15:32:44 UTC
(rev 75646)
+++ trunk/extensions/CentralAuth/migratePass0.php 2010-10-29 16:06:20 UTC
(rev 75647)
@@ -29,7 +29,7 @@
"user_id BETWEEN $min AND $max",
__FUNCTION__ );
- while ( $row = $dbr->fetchObject( $result ) ) {
+ foreach( $result as $row ) {
$users[intval( $row->user_id )] = $row->user_name;
++$migrated;
}
Modified: trunk/extensions/CentralAuth/migratePass1.php
===================================================================
--- trunk/extensions/CentralAuth/migratePass1.php 2010-10-29 15:32:44 UTC
(rev 75646)
+++ trunk/extensions/CentralAuth/migratePass1.php 2010-10-29 16:06:20 UTC
(rev 75647)
@@ -18,7 +18,7 @@
array( 'gn_name' ),
'',
__METHOD__ );
- while ( $row = $dbBackground->fetchObject( $result ) ) {
+ foreach( $result as $row ) {
$name = $row->gn_name;
$central = new CentralAuthUser( $name );
if ( $central->storeAndMigrate() ) {
Modified: trunk/extensions/CentralAuth/migrateStewards.php
===================================================================
--- trunk/extensions/CentralAuth/migrateStewards.php 2010-10-29 15:32:44 UTC
(rev 75646)
+++ trunk/extensions/CentralAuth/migrateStewards.php 2010-10-29 16:06:20 UTC
(rev 75647)
@@ -16,7 +16,7 @@
'migrateStewards.php'
);
$localStewards = array();
-while ( $row = $dbl->fetchObject( $result ) ) {
+foreach ( $result as $row ) {
$localStewards[] = $row->user_name;
}
@@ -33,7 +33,7 @@
),
'migrateStewards.php'
);
-while ( $row = $dbl->fetchObject( $result ) ) {
+foreach ( $result as $row ) {
$globalStewards[$row->gu_name] = $row->gu_id;
}
Modified: trunk/extensions/CheckUser/install.inc
===================================================================
--- trunk/extensions/CheckUser/install.inc 2010-10-29 15:32:44 UTC (rev
75646)
+++ trunk/extensions/CheckUser/install.inc 2010-10-29 16:06:20 UTC (rev
75647)
@@ -43,7 +43,7 @@
$cond = "rc_id BETWEEN $blockStart AND $blockEnd $cutoffCond";
$res = $db->select( 'recentchanges', '*', $cond, __FUNCTION__ );
$batch = array();
- while ( $row = $db->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$batch[] = array(
'cuc_timestamp' => $row->rc_timestamp,
'cuc_user' => $row->rc_user,
Modified: trunk/extensions/CommunityVoice/Modules/Ratings.php
===================================================================
--- trunk/extensions/CommunityVoice/Modules/Ratings.php 2010-10-29 15:32:44 UTC
(rev 75646)
+++ trunk/extensions/CommunityVoice/Modules/Ratings.php 2010-10-29 16:06:20 UTC
(rev 75647)
@@ -24,7 +24,7 @@
'DISTINCT vot_category'
);
$categories = array();
- while ( $row = $result->fetchRow() ) {
+ foreach( $result as $row ) {
$categories[] = (string)$row['vot_category'];
}
return $categories;
Modified: trunk/extensions/ProofreadPage/SpecialPagesWithoutScans.php
===================================================================
--- trunk/extensions/ProofreadPage/SpecialPagesWithoutScans.php 2010-10-29
15:32:44 UTC (rev 75646)
+++ trunk/extensions/ProofreadPage/SpecialPagesWithoutScans.php 2010-10-29
16:06:20 UTC (rev 75647)
@@ -84,7 +84,7 @@
'page_namespace' =>
$disPageObj->getNamespace(), 'page_title' => $disPageObj->getDBkey()),
__METHOD__ );
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$linkBatch->addObj( Title::makeTitle(
NS_TEMPLATE, $row->pl_title ));
}
@@ -94,8 +94,6 @@
}
function getSQL() {
- global $wgContentNamespaces;
-
$dbr = wfGetDB( DB_SLAVE );
$page = $dbr->tableName( 'page' );
$templatelinks = $dbr->tableName( 'templatelinks' );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
