| Index: trunk/phase3/includes/api/ApiQueryProtectedTitles.php |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | |
| 79 | 79 | $count = 0; |
| 80 | 80 | $result = $this->getResult(); |
| 81 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 81 | + foreach ( $res as $row ) { |
| 82 | 82 | if ( ++ $count > $params['limit'] ) { |
| 83 | 83 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 84 | 84 | $this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->pt_timestamp ) ); |
| Index: trunk/phase3/includes/api/ApiQueryAllCategories.php |
| — | — | @@ -86,7 +86,7 @@ |
| 87 | 87 | $categories = array(); |
| 88 | 88 | $result = $this->getResult(); |
| 89 | 89 | $count = 0; |
| 90 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 90 | + foreach ( $res as $row ) { |
| 91 | 91 | if ( ++ $count > $params['limit'] ) { |
| 92 | 92 | // We've reached the one extra which shows that there are additional cats to be had. Stop here... |
| 93 | 93 | // TODO: Security issue - if the user has no right to view next title, it will still be shown |
| Index: trunk/phase3/includes/api/ApiQueryIWLinks.php |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | |
| 86 | 86 | $count = 0; |
| 87 | 87 | $db = $this->getDB(); |
| 88 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 88 | + foreach ( $res as $row ) { |
| 89 | 89 | if ( ++$count > $params['limit'] ) { |
| 90 | 90 | // We've reached the one extra which shows that |
| 91 | 91 | // there are additional pages to be had. Stop here... |
| Index: trunk/phase3/includes/api/ApiQueryLinks.php |
| — | — | @@ -143,7 +143,7 @@ |
| 144 | 144 | |
| 145 | 145 | if ( is_null( $resultPageSet ) ) { |
| 146 | 146 | $count = 0; |
| 147 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 147 | + foreach ( $res as $row ) { |
| 148 | 148 | if ( ++$count > $params['limit'] ) { |
| 149 | 149 | // We've reached the one extra which shows that |
| 150 | 150 | // there are additional pages to be had. Stop here... |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | } else { |
| 167 | 167 | $titles = array(); |
| 168 | 168 | $count = 0; |
| 169 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 169 | + foreach ( $res as $row ) { |
| 170 | 170 | if ( ++$count > $params['limit'] ) { |
| 171 | 171 | // We've reached the one extra which shows that |
| 172 | 172 | // there are additional pages to be had. Stop here... |
| Index: trunk/phase3/includes/api/ApiQueryExtLinksUsage.php |
| — | — | @@ -113,7 +113,7 @@ |
| 114 | 114 | |
| 115 | 115 | $result = $this->getResult(); |
| 116 | 116 | $count = 0; |
| 117 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 117 | + foreach ( $res as $row ) { |
| 118 | 118 | if ( ++ $count > $limit ) { |
| 119 | 119 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 120 | 120 | $this->setContinueEnumParameter( 'offset', $offset + $limit ); |
| Index: trunk/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -369,7 +369,7 @@ |
| 370 | 370 | $this->addWhereFld( 'pr_page', array_keys( $this->titles ) ); |
| 371 | 371 | |
| 372 | 372 | $res = $this->select( __METHOD__ ); |
| 373 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 373 | + foreach ( $res as $row ) { |
| 374 | 374 | $a = array( |
| 375 | 375 | 'type' => $row->pr_type, |
| 376 | 376 | 'level' => $row->pr_level, |
| — | — | @@ -426,7 +426,7 @@ |
| 427 | 427 | $this->addFields( array( 'pt_title', 'pt_namespace', 'pt_create_perm', 'pt_expiry' ) ); |
| 428 | 428 | $this->addWhere( $lb->constructSet( 'pt', $db ) ); |
| 429 | 429 | $res = $this->select( __METHOD__ ); |
| 430 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 430 | + foreach ( $res as $row ) { |
| 431 | 431 | $this->protections[$row->pt_namespace][$row->pt_title][] = array( |
| 432 | 432 | 'type' => 'create', |
| 433 | 433 | 'level' => $row->pt_create_perm, |
| — | — | @@ -459,7 +459,7 @@ |
| 460 | 460 | $this->addWhereFld( 'pr_cascade', 1 ); |
| 461 | 461 | |
| 462 | 462 | $res = $this->select( __METHOD__ ); |
| 463 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 463 | + foreach ( $res as $row ) { |
| 464 | 464 | $source = Title::makeTitle( $row->page_namespace, $row->page_title ); |
| 465 | 465 | $this->protections[$row->tl_namespace][$row->tl_title][] = array( |
| 466 | 466 | 'type' => $row->pr_type, |
| — | — | @@ -482,7 +482,7 @@ |
| 483 | 483 | $this->addWhereFld( 'il_to', $images ); |
| 484 | 484 | |
| 485 | 485 | $res = $this->select( __METHOD__ ); |
| 486 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 486 | + foreach ( $res as $row ) { |
| 487 | 487 | $source = Title::makeTitle( $row->page_namespace, $row->page_title ); |
| 488 | 488 | $this->protections[NS_FILE][$row->il_to][] = array( |
| 489 | 489 | 'type' => $row->pr_type, |
| — | — | @@ -522,7 +522,7 @@ |
| 523 | 523 | $this->addFields( array( 'page_title', 'page_namespace', 'page_id' ) ); |
| 524 | 524 | $this->addWhere( $lb->constructSet( 'page', $db ) ); |
| 525 | 525 | $res = $this->select( __METHOD__ ); |
| 526 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 526 | + foreach ( $res as $row ) { |
| 527 | 527 | if ( MWNamespace::isTalk( $row->page_namespace ) ) { |
| 528 | 528 | $this->talkids[MWNamespace::getSubject( $row->page_namespace )][$row->page_title] = |
| 529 | 529 | intval( $row->page_id ); |
| — | — | @@ -560,7 +560,7 @@ |
| 561 | 561 | |
| 562 | 562 | $res = $this->select( __METHOD__ ); |
| 563 | 563 | |
| 564 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 564 | + foreach ( $res as $row ) { |
| 565 | 565 | $this->watched[$row->page_namespace][$row->page_title] = true; |
| 566 | 566 | } |
| 567 | 567 | } |
| Index: trunk/phase3/includes/api/ApiQueryIWBacklinks.php |
| — | — | @@ -87,7 +87,7 @@ |
| 88 | 88 | |
| 89 | 89 | $count = 0; |
| 90 | 90 | $result = $this->getResult(); |
| 91 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 91 | + foreach ( $res as $row ) { |
| 92 | 92 | if ( ++ $count > $params['limit'] ) { |
| 93 | 93 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 94 | 94 | // Continue string preserved in case the redirect query doesn't pass the limit |
| Index: trunk/phase3/includes/api/ApiQueryBacklinks.php |
| — | — | @@ -213,7 +213,7 @@ |
| 214 | 214 | $this->pageMap = array(); // Maps ns and title to pageid |
| 215 | 215 | $this->continueStr = null; |
| 216 | 216 | $this->redirTitles = array(); |
| 217 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 217 | + foreach ( $res as $row ) { |
| 218 | 218 | if ( ++ $count > $this->params['limit'] ) { |
| 219 | 219 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 220 | 220 | // Continue string preserved in case the redirect query doesn't pass the limit |
| — | — | @@ -238,7 +238,7 @@ |
| 239 | 239 | $this->prepareSecondQuery( $resultPageSet ); |
| 240 | 240 | $res = $this->select( __METHOD__ . '::secondQuery' ); |
| 241 | 241 | $count = 0; |
| 242 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 242 | + foreach ( $res as $row ) { |
| 243 | 243 | if ( ++$count > $this->params['limit'] ) { |
| 244 | 244 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 245 | 245 | // We need to keep the parent page of this redir in |
| Index: trunk/phase3/includes/api/ApiQueryAllLinks.php |
| — | — | @@ -111,7 +111,7 @@ |
| 112 | 112 | $pageids = array(); |
| 113 | 113 | $count = 0; |
| 114 | 114 | $result = $this->getResult(); |
| 115 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 115 | + foreach ( $res as $row ) { |
| 116 | 116 | if ( ++ $count > $limit ) { |
| 117 | 117 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 118 | 118 | // TODO: Security issue - if the user has no right to view next title, it will still be shown |
| Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php |
| — | — | @@ -257,7 +257,7 @@ |
| 258 | 258 | |
| 259 | 259 | $data = array(); |
| 260 | 260 | $langNames = Language::getLanguageNames(); |
| 261 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 261 | + foreach ( $res as $row ) { |
| 262 | 262 | $val = array(); |
| 263 | 263 | $val['prefix'] = $row->iw_prefix; |
| 264 | 264 | if ( $row->iw_local == '1' ) { |
| Index: trunk/phase3/includes/api/ApiQueryAllpages.php |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | |
| 152 | 152 | $count = 0; |
| 153 | 153 | $result = $this->getResult(); |
| 154 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 154 | + foreach ( $res as $row ) { |
| 155 | 155 | if ( ++ $count > $limit ) { |
| 156 | 156 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 157 | 157 | // TODO: Security issue - if the user has no right to view next title, it will still be shown |
| Index: trunk/phase3/includes/api/ApiQueryAllimages.php |
| — | — | @@ -113,7 +113,7 @@ |
| 114 | 114 | $titles = array(); |
| 115 | 115 | $count = 0; |
| 116 | 116 | $result = $this->getResult(); |
| 117 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 117 | + foreach ( $res as $row ) { |
| 118 | 118 | if ( ++ $count > $limit ) { |
| 119 | 119 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 120 | 120 | // TODO: Security issue - if the user has no right to view next title, it will still be shown |
| Index: trunk/phase3/includes/api/ApiPageSet.php |
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | ApiBase::dieDebug( __METHOD__, 'Missing $processTitles parameter when $remaining is provided' ); |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 461 | + foreach ( $res as $row ) { |
| 462 | 462 | $pageId = intval( $row->page_id ); |
| 463 | 463 | |
| 464 | 464 | // Remove found page from the list of remaining items |
| — | — | @@ -519,7 +519,7 @@ |
| 520 | 520 | // Get pageIDs data from the `page` table |
| 521 | 521 | $this->profileDBIn(); |
| 522 | 522 | $res = $db->select( $tables, $fields, $where, __METHOD__ ); |
| 523 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 523 | + foreach ( $res as $row ) { |
| 524 | 524 | $revid = intval( $row->rev_id ); |
| 525 | 525 | $pageid = intval( $row->rev_page ); |
| 526 | 526 | $this->mGoodRevIDs[$revid] = $pageid; |
| — | — | @@ -594,7 +594,7 @@ |
| 595 | 595 | ); |
| 596 | 596 | $this->profileDBOut(); |
| 597 | 597 | |
| 598 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 598 | + foreach ( $res as $row ) { |
| 599 | 599 | $rdfrom = intval( $row->rd_from ); |
| 600 | 600 | $from = $this->mPendingRedirectIDs[$rdfrom]->getPrefixedText(); |
| 601 | 601 | $to = Title::makeTitle( $row->rd_namespace, $row->rd_title )->getPrefixedText(); |
| Index: trunk/phase3/includes/api/ApiQueryLogEvents.php |
| — | — | @@ -154,7 +154,7 @@ |
| 155 | 155 | |
| 156 | 156 | $count = 0; |
| 157 | 157 | $res = $this->select( __METHOD__ ); |
| 158 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 158 | + foreach ( $res as $row ) { |
| 159 | 159 | if ( ++ $count > $limit ) { |
| 160 | 160 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 161 | 161 | $this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->log_timestamp ) ); |
| Index: trunk/phase3/includes/api/ApiQueryLangLinks.php |
| — | — | @@ -79,7 +79,7 @@ |
| 80 | 80 | |
| 81 | 81 | $count = 0; |
| 82 | 82 | $db = $this->getDB(); |
| 83 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 83 | + foreach ( $res as $row ) { |
| 84 | 84 | if ( ++$count > $params['limit'] ) { |
| 85 | 85 | // We've reached the one extra which shows that |
| 86 | 86 | // there are additional pages to be had. Stop here... |
| Index: trunk/phase3/includes/api/ApiQueryCategories.php |
| — | — | @@ -130,7 +130,7 @@ |
| 131 | 131 | |
| 132 | 132 | if ( is_null( $resultPageSet ) ) { |
| 133 | 133 | $count = 0; |
| 134 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 134 | + foreach ( $res as $row ) { |
| 135 | 135 | if ( ++$count > $params['limit'] ) { |
| 136 | 136 | // We've reached the one extra which shows that |
| 137 | 137 | // there are additional pages to be had. Stop here... |
| — | — | @@ -161,7 +161,7 @@ |
| 162 | 162 | } |
| 163 | 163 | } else { |
| 164 | 164 | $titles = array(); |
| 165 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 165 | + foreach ( $res as $row ) { |
| 166 | 166 | if ( ++$count > $params['limit'] ) { |
| 167 | 167 | // We've reached the one extra which shows that |
| 168 | 168 | // there are additional pages to be had. Stop here... |
| Index: trunk/phase3/includes/api/ApiQueryCategoryInfo.php |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | $res = $this->select( __METHOD__ ); |
| 80 | 80 | |
| 81 | 81 | $catids = array_flip( $cattitles ); |
| 82 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 82 | + foreach ( $res as $row ) { |
| 83 | 83 | $vals = array(); |
| 84 | 84 | $vals['size'] = intval( $row->cat_pages ); |
| 85 | 85 | $vals['pages'] = $row->cat_pages - $row->cat_subcats - $row->cat_files; |
| Index: trunk/phase3/includes/api/ApiQueryDuplicateFiles.php |
| — | — | @@ -92,7 +92,7 @@ |
| 93 | 93 | $db = $this->getDB(); |
| 94 | 94 | $count = 0; |
| 95 | 95 | $titles = array(); |
| 96 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 96 | + foreach ( $res as $row ) { |
| 97 | 97 | if ( ++$count > $params['limit'] ) { |
| 98 | 98 | // We've reached the one extra which shows that |
| 99 | 99 | // there are additional pages to be had. Stop here... |
| Index: trunk/phase3/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -178,7 +178,7 @@ |
| 179 | 179 | $count = 0; |
| 180 | 180 | $res = $this->select( __METHOD__ ); |
| 181 | 181 | |
| 182 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 182 | + foreach ( $res as $row ) { |
| 183 | 183 | if ( ++ $count > $params['limit'] ) { |
| 184 | 184 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 185 | 185 | $this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->rc_timestamp ) ); |
| Index: trunk/phase3/includes/api/ApiQueryImages.php |
| — | — | @@ -88,7 +88,7 @@ |
| 89 | 89 | |
| 90 | 90 | if ( is_null( $resultPageSet ) ) { |
| 91 | 91 | $count = 0; |
| 92 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 92 | + foreach ( $res as $row ) { |
| 93 | 93 | if ( ++$count > $params['limit'] ) { |
| 94 | 94 | // We've reached the one extra which shows that |
| 95 | 95 | // there are additional pages to be had. Stop here... |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | } else { |
| 110 | 110 | $titles = array(); |
| 111 | 111 | $count = 0; |
| 112 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 112 | + foreach ( $result as $row ) { |
| 113 | 113 | if ( ++$count > $params['limit'] ) { |
| 114 | 114 | // We've reached the one extra which shows that |
| 115 | 115 | // there are additional pages to be had. Stop here... |
| Index: trunk/phase3/includes/api/ApiQueryDeletedrevs.php |
| — | — | @@ -182,7 +182,7 @@ |
| 183 | 183 | $pageMap = array(); // Maps ns&title to (fake) pageid |
| 184 | 184 | $count = 0; |
| 185 | 185 | $newPageID = 0; |
| 186 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 186 | + foreach ( $res as $row ) { |
| 187 | 187 | if ( ++$count > $limit ) { |
| 188 | 188 | // We've had enough |
| 189 | 189 | if ( $mode == 'all' || $mode == 'revs' ) { |
| Index: trunk/phase3/includes/api/ApiQueryWatchlistRaw.php |
| — | — | @@ -96,7 +96,7 @@ |
| 97 | 97 | $db = $this->getDB(); |
| 98 | 98 | $titles = array(); |
| 99 | 99 | $count = 0; |
| 100 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 100 | + foreach ( $res as $row ) { |
| 101 | 101 | if ( ++$count > $params['limit'] ) { |
| 102 | 102 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 103 | 103 | $this->setContinueEnumParameter( 'continue', $row->wl_namespace . '|' . |
| Index: trunk/phase3/includes/api/ApiQueryRandom.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | $db = $this->getDB(); |
| 69 | 69 | $res = $this->select( __METHOD__ ); |
| 70 | 70 | $count = 0; |
| 71 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 71 | + foreach ( $res as $row ) { |
| 72 | 72 | $count++; |
| 73 | 73 | if ( is_null( $resultPageSet ) ) { |
| 74 | 74 | // Prevent duplicates |
| Index: trunk/phase3/includes/api/ApiQueryRevisions.php |
| — | — | @@ -322,7 +322,7 @@ |
| 323 | 323 | $count = 0; |
| 324 | 324 | $res = $this->select( __METHOD__ ); |
| 325 | 325 | |
| 326 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 326 | + foreach ( $res as $row ) { |
| 327 | 327 | if ( ++ $count > $limit ) { |
| 328 | 328 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 329 | 329 | if ( !$enumRevMode ) { |
| Index: trunk/phase3/includes/api/ApiQueryFilearchive.php |
| — | — | @@ -120,7 +120,7 @@ |
| 121 | 121 | $titles = array(); |
| 122 | 122 | $count = 0; |
| 123 | 123 | $result = $this->getResult(); |
| 124 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 124 | + foreach ( $res as $row ) { |
| 125 | 125 | if ( ++$count > $limit ) { |
| 126 | 126 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 127 | 127 | // TODO: Security issue - if the user has no right to view next title, it will still be shown |
| Index: trunk/phase3/includes/api/ApiQueryExternalLinks.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | $res = $this->select( __METHOD__ ); |
| 69 | 69 | |
| 70 | 70 | $count = 0; |
| 71 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 71 | + foreach ( $res as $row ) { |
| 72 | 72 | if ( ++$count > $params['limit'] ) { |
| 73 | 73 | // We've reached the one extra which shows that |
| 74 | 74 | // there are additional pages to be had. Stop here... |
| Index: trunk/phase3/includes/api/ApiQueryCategoryMembers.php |
| — | — | @@ -110,7 +110,7 @@ |
| 111 | 111 | $count = 0; |
| 112 | 112 | $lastSortKey = null; |
| 113 | 113 | $res = $this->select( __METHOD__ ); |
| 114 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 114 | + foreach ( $res as $row ) { |
| 115 | 115 | if ( ++ $count > $limit ) { |
| 116 | 116 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 117 | 117 | // TODO: Security issue - if the user has no right to view next title, it will still be shown |
| Index: trunk/phase3/includes/api/ApiQueryUsers.php |
| — | — | @@ -126,8 +126,8 @@ |
| 127 | 127 | |
| 128 | 128 | $data = array(); |
| 129 | 129 | $res = $this->select( __METHOD__ ); |
| 130 | | - while ( ( $r = $db->fetchObject( $res ) ) ) { |
| 131 | | - $user = User::newFromRow( $r ); |
| | 130 | + foreach ( $rowes as $row ) { |
| | 131 | + $user = User::newFromRow( $row ); |
| 132 | 132 | $name = $user->getName(); |
| 133 | 133 | $data[$name]['name'] = $name; |
| 134 | 134 | |
| — | — | @@ -139,14 +139,14 @@ |
| 140 | 140 | $data[$name]['registration'] = wfTimestampOrNull( TS_ISO_8601, $user->getRegistration() ); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | | - if ( isset( $this->prop['groups'] ) && !is_null( $r->ug_group ) ) { |
| | 143 | + if ( isset( $this->prop['groups'] ) && !is_null( $row->ug_group ) ) { |
| 144 | 144 | // This row contains only one group, others will be added from other rows |
| 145 | | - $data[$name]['groups'][] = $r->ug_group; |
| | 145 | + $data[$name]['groups'][] = $row->ug_group; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | | - if ( isset( $this->prop['blockinfo'] ) && !is_null( $r->blocker_name ) ) { |
| 149 | | - $data[$name]['blockedby'] = $r->blocker_name; |
| 150 | | - $data[$name]['blockreason'] = $r->ipb_reason; |
| | 148 | + if ( isset( $this->prop['blockinfo'] ) && !is_null( $row->blocker_name ) ) { |
| | 149 | + $data[$name]['blockedby'] = $row->blocker_name; |
| | 150 | + $data[$name]['blockreason'] = $row->ipb_reason; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | if ( isset( $this->prop['emailable'] ) && $user->canReceiveEmail() ) { |
| Index: trunk/phase3/includes/api/ApiQueryUserContributions.php |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | $limit = $this->params['limit']; |
| 93 | 93 | |
| 94 | 94 | // Fetch each row |
| 95 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 95 | + foreach ( $res as $row ) { |
| 96 | 96 | if ( ++ $count > $limit ) { |
| 97 | 97 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 98 | 98 | if ( $this->multiUserMode ) { |
| Index: trunk/phase3/includes/api/ApiQueryRecentChanges.php |
| — | — | @@ -252,7 +252,7 @@ |
| 253 | 253 | $res = $this->select( __METHOD__ ); |
| 254 | 254 | |
| 255 | 255 | /* Iterate through the rows, adding data extracted from them to our query result. */ |
| 256 | | - while ( $row = $db->fetchObject( $res ) ) { |
| | 256 | + foreach ( $res as $row ) { |
| 257 | 257 | if ( ++ $count > $params['limit'] ) { |
| 258 | 258 | // We've reached the one extra which shows that there are additional pages to be had. Stop here... |
| 259 | 259 | $this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->rc_timestamp ) ); |