Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Per http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66168#c7252 switch while ( $row = $db->fectchObject( $res ) ) to foreach ( $res as row )

Browse source 
On ApiQueryUsers switch $r to row, and remove nested brackets
This commit is contained in:
Sam Reed 2010-06-20 18:48:34 +00:00
parent e19087423a
commit faf34b4073
30 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/api/ApiPageSet.php
View file

@ -457,7 +457,7 @@ class ApiPageSet extends ApiQueryBase {
ApiBase::dieDebug( __METHOD__, 'Missing $processTitles parameter when $remaining is provided' );
}
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$pageId = intval( $row->page_id );
// Remove found page from the list of remaining items
@ -519,7 +519,7 @@ class ApiPageSet extends ApiQueryBase {
// Get pageIDs data from the `page` table
$this->profileDBIn();
$res = $db->select( $tables, $fields, $where, __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$revid = intval( $row->rev_id );
$pageid = intval( $row->rev_page );
$this->mGoodRevIDs[$revid] = $pageid;
@ -594,7 +594,7 @@ class ApiPageSet extends ApiQueryBase {
);
$this->profileDBOut();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$rdfrom = intval( $row->rd_from );
$from = $this->mPendingRedirectIDs[$rdfrom]->getPrefixedText();
$to = Title::makeTitle( $row->rd_namespace, $row->rd_title )->getPrefixedText();

2
includes/api/ApiQueryAllCategories.php
View file

@ -86,7 +86,7 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase {
$categories = array();
$result = $this->getResult();
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $params['limit'] ) {
// We've reached the one extra which shows that there are additional cats to be had. Stop here...
// TODO: Security issue - if the user has no right to view next title, it will still be shown

2
includes/api/ApiQueryAllLinks.php
View file

@ -111,7 +111,7 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
$pageids = array();
$count = 0;
$result = $this->getResult();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// TODO: Security issue - if the user has no right to view next title, it will still be shown

2
includes/api/ApiQueryAllimages.php
View file

@ -113,7 +113,7 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
$titles = array();
$count = 0;
$result = $this->getResult();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// TODO: Security issue - if the user has no right to view next title, it will still be shown

2
includes/api/ApiQueryAllpages.php
View file

@ -150,7 +150,7 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
$count = 0;
$result = $this->getResult();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// TODO: Security issue - if the user has no right to view next title, it will still be shown

4
includes/api/ApiQueryBacklinks.php
View file

@ -213,7 +213,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
$this->pageMap = array(); // Maps ns and title to pageid
$this->continueStr = null;
$this->redirTitles = array();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $this->params['limit'] ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// Continue string preserved in case the redirect query doesn't pass the limit
@ -238,7 +238,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
$this->prepareSecondQuery( $resultPageSet );
$res = $this->select( __METHOD__ . '::secondQuery' );
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $this->params['limit'] ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// We need to keep the parent page of this redir in

4
includes/api/ApiQueryCategories.php
View file

@ -130,7 +130,7 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
if ( is_null( $resultPageSet ) ) {
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...
@ -161,7 +161,7 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
}
} else {
$titles = array();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...

2
includes/api/ApiQueryCategoryInfo.php
View file

@ -78,7 +78,7 @@ class ApiQueryCategoryInfo extends ApiQueryBase {
$res = $this->select( __METHOD__ );
$catids = array_flip( $cattitles );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$vals = array();
$vals['size'] = intval( $row->cat_pages );
$vals['pages'] = $row->cat_pages - $row->cat_subcats - $row->cat_files;

2
includes/api/ApiQueryCategoryMembers.php
View file

@ -110,7 +110,7 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
$count = 0;
$lastSortKey = null;
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// TODO: Security issue - if the user has no right to view next title, it will still be shown

2
includes/api/ApiQueryDeletedrevs.php
View file

@ -182,7 +182,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
$pageMap = array(); // Maps ns&title to (fake) pageid
$count = 0;
$newPageID = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $limit ) {
// We've had enough
if ( $mode == 'all' || $mode == 'revs' ) {

2
includes/api/ApiQueryDuplicateFiles.php
View file

@ -92,7 +92,7 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase {
$db = $this->getDB();
$count = 0;
$titles = array();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...

2
includes/api/ApiQueryExtLinksUsage.php
View file

@ -113,7 +113,7 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
$result = $this->getResult();
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
$this->setContinueEnumParameter( 'offset', $offset + $limit );

2
includes/api/ApiQueryExternalLinks.php
View file

@ -67,7 +67,7 @@ class ApiQueryExternalLinks extends ApiQueryBase {
$res = $this->select( __METHOD__ );
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...

2
includes/api/ApiQueryFilearchive.php
View file

@ -120,7 +120,7 @@ class ApiQueryFilearchive extends ApiQueryBase {
$titles = array();
$count = 0;
$result = $this->getResult();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// TODO: Security issue - if the user has no right to view next title, it will still be shown

2
includes/api/ApiQueryIWBacklinks.php
View file

@ -87,7 +87,7 @@ class ApiQueryIWBacklinks extends ApiQueryBase {
$count = 0;
$result = $this->getResult();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $params['limit'] ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// Continue string preserved in case the redirect query doesn't pass the limit

2
includes/api/ApiQueryIWLinks.php
View file

@ -84,7 +84,7 @@ class ApiQueryIWLinks extends ApiQueryBase {
$count = 0;
$db = $this->getDB();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...

4
includes/api/ApiQueryImages.php
View file

@ -88,7 +88,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
if ( is_null( $resultPageSet ) ) {
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...
@ -108,7 +108,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
} else {
$titles = array();
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $result as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...

12
includes/api/ApiQueryInfo.php
View file

@ -369,7 +369,7 @@ class ApiQueryInfo extends ApiQueryBase {
$this->addWhereFld( 'pr_page', array_keys( $this->titles ) );
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$a = array(
'type' => $row->pr_type,
'level' => $row->pr_level,
@ -426,7 +426,7 @@ class ApiQueryInfo extends ApiQueryBase {
$this->addFields( array( 'pt_title', 'pt_namespace', 'pt_create_perm', 'pt_expiry' ) );
$this->addWhere( $lb->constructSet( 'pt', $db ) );
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$this->protections[$row->pt_namespace][$row->pt_title][] = array(
'type' => 'create',
'level' => $row->pt_create_perm,
@ -459,7 +459,7 @@ class ApiQueryInfo extends ApiQueryBase {
$this->addWhereFld( 'pr_cascade', 1 );
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$source = Title::makeTitle( $row->page_namespace, $row->page_title );
$this->protections[$row->tl_namespace][$row->tl_title][] = array(
'type' => $row->pr_type,
@ -482,7 +482,7 @@ class ApiQueryInfo extends ApiQueryBase {
$this->addWhereFld( 'il_to', $images );
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$source = Title::makeTitle( $row->page_namespace, $row->page_title );
$this->protections[NS_FILE][$row->il_to][] = array(
'type' => $row->pr_type,
@ -522,7 +522,7 @@ class ApiQueryInfo extends ApiQueryBase {
$this->addFields( array( 'page_title', 'page_namespace', 'page_id' ) );
$this->addWhere( $lb->constructSet( 'page', $db ) );
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( MWNamespace::isTalk( $row->page_namespace ) ) {
$this->talkids[MWNamespace::getSubject( $row->page_namespace )][$row->page_title] =
intval( $row->page_id );
@ -560,7 +560,7 @@ class ApiQueryInfo extends ApiQueryBase {
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$this->watched[$row->page_namespace][$row->page_title] = true;
}
}

2
includes/api/ApiQueryLangLinks.php
View file

@ -79,7 +79,7 @@ class ApiQueryLangLinks extends ApiQueryBase {
$count = 0;
$db = $this->getDB();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...

4
includes/api/ApiQueryLinks.php
View file

@ -143,7 +143,7 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
if ( is_null( $resultPageSet ) ) {
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...
@ -165,7 +165,7 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
} else {
$titles = array();
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that
// there are additional pages to be had. Stop here...

2
includes/api/ApiQueryLogEvents.php
View file

@ -154,7 +154,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
$count = 0;
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
$this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->log_timestamp ) );

2
includes/api/ApiQueryProtectedTitles.php
View file

@ -77,7 +77,7 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase {
$count = 0;
$result = $this->getResult();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $params['limit'] ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
$this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->pt_timestamp ) );

2
includes/api/ApiQueryRandom.php
View file

@ -67,7 +67,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
$db = $this->getDB();
$res = $this->select( __METHOD__ );
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$count++;
if ( is_null( $resultPageSet ) ) {
// Prevent duplicates

2
includes/api/ApiQueryRecentChanges.php
View file

@ -252,7 +252,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
$res = $this->select( __METHOD__ );
/* Iterate through the rows, adding data extracted from them to our query result. */
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $params['limit'] ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
$this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->rc_timestamp ) );

2
includes/api/ApiQueryRevisions.php
View file

@ -322,7 +322,7 @@ class ApiQueryRevisions extends ApiQueryBase {
$count = 0;
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
if ( !$enumRevMode ) {

2
includes/api/ApiQuerySiteinfo.php
View file

@ -257,7 +257,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
$data = array();
$langNames = Language::getLanguageNames();
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
$val = array();
$val['prefix'] = $row->iw_prefix;
if ( $row->iw_local == '1' ) {

2
includes/api/ApiQueryUserContributions.php
View file

@ -91,7 +91,7 @@ class ApiQueryContributions extends ApiQueryBase {
$limit = $this->params['limit'];
// Fetch each row
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
if ( $this->multiUserMode ) {

14
includes/api/ApiQueryUsers.php
View file

@ -126,8 +126,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
$data = array();
$res = $this->select( __METHOD__ );
while ( ( $r = $db->fetchObject( $res ) ) ) {
$user = User::newFromRow( $r );
foreach ( $rowes as $row ) {
$user = User::newFromRow( $row );
$name = $user->getName();
$data[$name]['name'] = $name;
@ -139,14 +139,14 @@ if ( !defined( 'MEDIAWIKI' ) ) {
$data[$name]['registration'] = wfTimestampOrNull( TS_ISO_8601, $user->getRegistration() );
}
if ( isset( $this->prop['groups'] ) && !is_null( $r->ug_group ) ) {
if ( isset( $this->prop['groups'] ) && !is_null( $row->ug_group ) ) {
// This row contains only one group, others will be added from other rows
$data[$name]['groups'][] = $r->ug_group;
$data[$name]['groups'][] = $row->ug_group;
}
if ( isset( $this->prop['blockinfo'] ) && !is_null( $r->blocker_name ) ) {
$data[$name]['blockedby'] = $r->blocker_name;
$data[$name]['blockreason'] = $r->ipb_reason;
if ( isset( $this->prop['blockinfo'] ) && !is_null( $row->blocker_name ) ) {
$data[$name]['blockedby'] = $row->blocker_name;
$data[$name]['blockreason'] = $row->ipb_reason;
}
if ( isset( $this->prop['emailable'] ) && $user->canReceiveEmail() ) {

2
includes/api/ApiQueryWatchlist.php
View file

@ -178,7 +178,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
$count = 0;
$res = $this->select( __METHOD__ );
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++ $count > $params['limit'] ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
$this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->rc_timestamp ) );

2
includes/api/ApiQueryWatchlistRaw.php
View file

@ -96,7 +96,7 @@ class ApiQueryWatchlistRaw extends ApiQueryGeneratorBase {
$db = $this->getDB();
$titles = array();
$count = 0;
while ( $row = $db->fetchObject( $res ) ) {
foreach ( $res as $row ) {
if ( ++$count > $params['limit'] ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
$this->setContinueEnumParameter( 'continue', $row->wl_namespace . '|' .