| Index: trunk/phase3/includes/api/ApiQuery.php |
| — | — | @@ -264,9 +264,9 @@ |
| 265 | 265 | $pageSet = $this->getPageSet(); |
| 266 | 266 | $result = $this->getResult(); |
| 267 | 267 | |
| 268 | | - # We don't check for a full result set here because we can't be adding |
| 269 | | - # more than 380K. The maximum revision size is in the megabyte range, |
| 270 | | - # and the maximum result size must be even higher than that. |
| | 268 | + // We don't check for a full result set here because we can't be adding |
| | 269 | + // more than 380K. The maximum revision size is in the megabyte range, |
| | 270 | + // and the maximum result size must be even higher than that. |
| 271 | 271 | |
| 272 | 272 | // Title normalizations |
| 273 | 273 | $normValues = array (); |
| Index: trunk/phase3/includes/api/ApiFormatDbg.php |
| — | — | @@ -38,9 +38,9 @@ |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function getMimeType() { |
| 42 | | - # This looks like it should be text/plain, but IE7 is so |
| 43 | | - # brain-damaged it tries to parse text/plain as HTML if it |
| 44 | | - # contains HTML tags. Using MIME text/text works around this bug |
| | 42 | + // This looks like it should be text/plain, but IE7 is so |
| | 43 | + // brain-damaged it tries to parse text/plain as HTML if it |
| | 44 | + // contains HTML tags. Using MIME text/text works around this bug |
| 45 | 45 | return 'text/text'; |
| 46 | 46 | } |
| 47 | 47 | |
| Index: trunk/phase3/includes/api/ApiMove.php |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | | - # Move the page |
| | 88 | + // Move the page |
| 89 | 89 | $hookErr = null; |
| 90 | 90 | $retval = $fromTitle->moveTo( $toTitle, true, $params['reason'], !$params['noredirect'] ); |
| 91 | 91 | if ( $retval !== true ) |
| — | — | @@ -94,7 +94,7 @@ |
| 95 | 95 | if ( !$params['noredirect'] || !$wgUser->isAllowed( 'suppressredirect' ) ) |
| 96 | 96 | $r['redirectcreated'] = ''; |
| 97 | 97 | |
| 98 | | - # Move the talk page |
| | 98 | + // Move the talk page |
| 99 | 99 | if ( $params['movetalk'] && $fromTalk->exists() && !$fromTitle->isTalkPage() ) |
| 100 | 100 | { |
| 101 | 101 | $retval = $fromTalk->moveTo( $toTalk, true, $params['reason'], !$params['noredirect'] ); |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | | - # Move subpages |
| | 116 | + // Move subpages |
| 117 | 117 | if ( $params['movesubpages'] ) |
| 118 | 118 | { |
| 119 | 119 | $r['subpages'] = $this->moveSubpages( $fromTitle, $toTitle, |
| — | — | @@ -126,7 +126,7 @@ |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | | - # Watch pages |
| | 130 | + // Watch pages |
| 131 | 131 | if ( $params['watch'] || $wgUser->getOption( 'watchmoves' ) ) |
| 132 | 132 | { |
| 133 | 133 | $wgUser->addWatch( $fromTitle ); |
| Index: trunk/phase3/includes/api/ApiQueryLinks.php |
| — | — | @@ -100,11 +100,11 @@ |
| 101 | 101 | "{$this->prefix}_title >= '$pltitle')))" ); |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | | - # Here's some MySQL craziness going on: if you use WHERE foo='bar' |
| 105 | | - # and later ORDER BY foo MySQL doesn't notice the ORDER BY is pointless |
| 106 | | - # but instead goes and filesorts, because the index for foo was used |
| 107 | | - # already. To work around this, we drop constant fields in the WHERE |
| 108 | | - # clause from the ORDER BY clause |
| | 104 | + // Here's some MySQL craziness going on: if you use WHERE foo='bar' |
| | 105 | + // and later ORDER BY foo MySQL doesn't notice the ORDER BY is pointless |
| | 106 | + // but instead goes and filesorts, because the index for foo was used |
| | 107 | + // already. To work around this, we drop constant fields in the WHERE |
| | 108 | + // clause from the ORDER BY clause |
| 109 | 109 | $order = array(); |
| 110 | 110 | if ( count( $this->getPageSet()->getGoodTitles() ) != 1 ) |
| 111 | 111 | $order[] = "{$this->prefix}_from"; |
| Index: trunk/phase3/includes/api/ApiFormatYaml_spyc.php |
| — | — | @@ -151,9 +151,9 @@ |
| 152 | 152 | * @return bool |
| 153 | 153 | */ |
| 154 | 154 | function _needLiteral( $value ) { |
| 155 | | - # Check whether the string contains # or : or begins with any of: |
| 156 | | - # [ - ? , [ ] { } ! * & | > ' " % @ ` ] |
| 157 | | - # or is a number or contains newlines |
| | 155 | + // Check whether the string contains # or : or begins with any of: |
| | 156 | + // [ - ? , [ ] { } ! * & | > ' " % @ ` ] |
| | 157 | + // or is a number or contains newlines |
| 158 | 158 | return (bool)( gettype( $value ) == "string" && |
| 159 | 159 | ( is_numeric( $value ) || |
| 160 | 160 | strpos( $value, "\n" ) || |
| Index: trunk/phase3/includes/api/ApiPageSet.php |
| — | — | @@ -600,14 +600,14 @@ |
| 601 | 601 | $db->freeResult( $res ); |
| 602 | 602 | if ( $this->mPendingRedirectIDs ) |
| 603 | 603 | { |
| 604 | | - # We found pages that aren't in the redirect table |
| 605 | | - # Add them |
| | 604 | + // We found pages that aren't in the redirect table |
| | 605 | + // Add them |
| 606 | 606 | foreach ( $this->mPendingRedirectIDs as $id => $title ) |
| 607 | 607 | { |
| 608 | 608 | $article = new Article( $title ); |
| 609 | 609 | $rt = $article->insertRedirect(); |
| 610 | 610 | if ( !$rt ) |
| 611 | | - # What the hell. Let's just ignore this |
| | 611 | + // What the hell. Let's just ignore this |
| 612 | 612 | continue; |
| 613 | 613 | $lb->addObj( $rt ); |
| 614 | 614 | $this->mRedirectTitles[$title->getPrefixedText()] = $rt->getPrefixedText(); |
| — | — | @@ -635,7 +635,7 @@ |
| 636 | 636 | $titleObj = is_string( $title ) ? Title :: newFromText( $title ) : $title; |
| 637 | 637 | if ( !$titleObj ) |
| 638 | 638 | { |
| 639 | | - # Handle invalid titles gracefully |
| | 639 | + // Handle invalid titles gracefully |
| 640 | 640 | $this->mAllpages[0][$title] = $this->mFakePageId; |
| 641 | 641 | $this->mInvalidTitles[$this->mFakePageId] = $title; |
| 642 | 642 | $this->mFakePageId--; |
| Index: trunk/phase3/includes/api/ApiRollback.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | if ( !$titleObj->exists() ) |
| 55 | 55 | $this->dieUsageMsg( array( 'notanarticle' ) ); |
| 56 | 56 | |
| 57 | | - # We need to be able to revert IPs, but getCanonicalName rejects them |
| | 57 | + // We need to be able to revert IPs, but getCanonicalName rejects them |
| 58 | 58 | $username = User::isIP( $params['user'] ) |
| 59 | 59 | ? $params['user'] |
| 60 | 60 | : User::getCanonicalName( $params['user'] ); |
| Index: trunk/phase3/includes/api/ApiDelete.php |
| — | — | @@ -126,8 +126,8 @@ |
| 127 | 127 | // Auto-generate a summary, if necessary |
| 128 | 128 | if ( is_null( $reason ) ) |
| 129 | 129 | { |
| 130 | | - # Need to pass a throwaway variable because generateReason expects |
| 131 | | - # a reference |
| | 130 | + // Need to pass a throwaway variable because generateReason expects |
| | 131 | + // a reference |
| 132 | 132 | $hasHistory = false; |
| 133 | 133 | $reason = $article->generateReason( $hasHistory ); |
| 134 | 134 | if ( $reason === false ) |
| — | — | @@ -162,7 +162,7 @@ |
| 163 | 163 | |
| 164 | 164 | if ( !FileDeleteForm::haveDeletableFile( $file, $oldfile, $oldimage ) ) |
| 165 | 165 | return self::delete( new Article( $title ), $token, $reason ); |
| 166 | | - if ( is_null( $reason ) ) # Log and RC don't like null reasons |
| | 166 | + if ( is_null( $reason ) ) // Log and RC don't like null reasons |
| 167 | 167 | $reason = ''; |
| 168 | 168 | $status = FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, $suppress ); |
| 169 | 169 | |
| Index: trunk/phase3/includes/api/ApiQueryCategories.php |
| — | — | @@ -114,7 +114,7 @@ |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | $this->addOption( 'USE INDEX', array( 'categorylinks' => 'cl_from' ) ); |
| 118 | | - # Don't order by cl_from if it's constant in the WHERE clause |
| | 118 | + // Don't order by cl_from if it's constant in the WHERE clause |
| 119 | 119 | if ( count( $this->getPageSet()->getGoodTitles() ) == 1 ) |
| 120 | 120 | $this->addOption( 'ORDER BY', 'cl_to' ); |
| 121 | 121 | else |
| Index: trunk/phase3/includes/api/ApiQueryCategoryMembers.php |
| — | — | @@ -83,8 +83,8 @@ |
| 84 | 84 | $this->addWhere( 'cl_from=page_id' ); |
| 85 | 85 | $this->setContinuation( $params['continue'], $params['dir'] ); |
| 86 | 86 | $this->addWhereFld( 'cl_to', $categoryTitle->getDBkey() ); |
| 87 | | - # Scanning large datasets for rare categories sucks, and I already told |
| 88 | | - # how to have efficient subcategory access :-) ~~~~ (oh well, domas) |
| | 87 | + // Scanning large datasets for rare categories sucks, and I already told |
| | 88 | + // how to have efficient subcategory access :-) ~~~~ (oh well, domas) |
| 89 | 89 | global $wgMiserMode; |
| 90 | 90 | $miser_ns = array(); |
| 91 | 91 | if ( $wgMiserMode ) { |
| Index: trunk/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -354,7 +354,7 @@ |
| 355 | 355 | $a['cascade'] = ''; |
| 356 | 356 | $this->protections[$row->page_namespace][$row->page_title][] = $a; |
| 357 | 357 | |
| 358 | | - # Also check old restrictions |
| | 358 | + // Also check old restrictions |
| 359 | 359 | if ( $this->pageRestrictions[$row->pr_page] ) { |
| 360 | 360 | $restrictions = explode( ':', trim( $this->pageRestrictions[$row->pr_page] ) ); |
| 361 | 361 | foreach ( $restrictions as $restrict ) { |
| Index: trunk/phase3/includes/api/ApiEditPage.php |
| — | — | @@ -138,7 +138,7 @@ |
| 139 | 139 | $params['summary'] = wfMsgForContent( 'undo-summary', $params['undo'], $undoRev->getUserText() ); |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | | - # See if the MD5 hash checks out |
| | 142 | + // See if the MD5 hash checks out |
| 143 | 143 | if ( !is_null( $params['md5'] ) && md5( $toMD5 ) !== $params['md5'] ) |
| 144 | 144 | $this->dieUsageMsg( array( 'hashcheckfailed' ) ); |
| 145 | 145 | |
| — | — | @@ -153,8 +153,8 @@ |
| 154 | 154 | if ( !is_null( $params['summary'] ) ) |
| 155 | 155 | $reqArr['wpSummary'] = $params['summary']; |
| 156 | 156 | |
| 157 | | - # Watch out for basetimestamp == '' |
| 158 | | - # wfTimestamp() treats it as NOW, almost certainly causing an edit conflict |
| | 157 | + // Watch out for basetimestamp == '' |
| | 158 | + // wfTimestamp() treats it as NOW, almost certainly causing an edit conflict |
| 159 | 159 | if ( !is_null( $params['basetimestamp'] ) && $params['basetimestamp'] != '' ) |
| 160 | 160 | $reqArr['wpEdittime'] = wfTimestamp( TS_MW, $params['basetimestamp'] ); |
| 161 | 161 | else |
| — | — | @@ -163,7 +163,7 @@ |
| 164 | 164 | if ( !is_null( $params['starttimestamp'] ) && $params['starttimestamp'] != '' ) |
| 165 | 165 | $reqArr['wpStarttime'] = wfTimestamp( TS_MW, $params['starttimestamp'] ); |
| 166 | 166 | else |
| 167 | | - $reqArr['wpStarttime'] = $reqArr['wpEdittime']; # Fake wpStartime |
| | 167 | + $reqArr['wpStarttime'] = $reqArr['wpEdittime']; // Fake wpStartime |
| 168 | 168 | |
| 169 | 169 | if ( $params['minor'] || ( !$params['notminor'] && $wgUser->getOption( 'minordefault' ) ) ) |
| 170 | 170 | $reqArr['wpMinoredit'] = ''; |
| — | — | @@ -212,8 +212,8 @@ |
| 213 | 213 | $req = new FauxRequest( $reqArr, true ); |
| 214 | 214 | $ep->importFormData( $req ); |
| 215 | 215 | |
| 216 | | - # Run hooks |
| 217 | | - # Handle CAPTCHA parameters |
| | 216 | + // Run hooks |
| | 217 | + // Handle CAPTCHA parameters |
| 218 | 218 | global $wgRequest; |
| 219 | 219 | if ( !is_null( $params['captchaid'] ) ) |
| 220 | 220 | $wgRequest->setVal( 'wpCaptchaId', $params['captchaid'] ); |
| — | — | @@ -233,11 +233,11 @@ |
| 234 | 234 | $this->dieUsageMsg( array( 'hookaborted' ) ); |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | | - # Do the actual save |
| | 237 | + // Do the actual save |
| 238 | 238 | $oldRevId = $articleObj->getRevIdFetched(); |
| 239 | 239 | $result = null; |
| 240 | | - # Fake $wgRequest for some hooks inside EditPage |
| 241 | | - # FIXME: This interface SUCKS |
| | 240 | + // Fake $wgRequest for some hooks inside EditPage |
| | 241 | + // FIXME: This interface SUCKS |
| 242 | 242 | $oldRequest = $wgRequest; |
| 243 | 243 | $wgRequest = $req; |
| 244 | 244 | |
| — | — | @@ -293,7 +293,7 @@ |
| 294 | 294 | case EditPage::AS_CONFLICT_DETECTED: |
| 295 | 295 | $this->dieUsageMsg( array( 'editconflict' ) ); |
| 296 | 296 | |
| 297 | | - # case EditPage::AS_SUMMARY_NEEDED: Can't happen since we set wpIgnoreBlankSummary |
| | 297 | + // case EditPage::AS_SUMMARY_NEEDED: Can't happen since we set wpIgnoreBlankSummary |
| 298 | 298 | case EditPage::AS_TEXTBOX_EMPTY: |
| 299 | 299 | $this->dieUsageMsg( array( 'emptynewsection' ) ); |
| 300 | 300 | |
| — | — | @@ -303,10 +303,10 @@ |
| 304 | 304 | $r['result'] = "Success"; |
| 305 | 305 | $r['pageid'] = intval( $titleObj->getArticleID() ); |
| 306 | 306 | $r['title'] = $titleObj->getPrefixedText(); |
| 307 | | - # HACK: We create a new Article object here because getRevIdFetched() |
| 308 | | - # refuses to be run twice, and because Title::getLatestRevId() |
| 309 | | - # won't fetch from the master unless we select for update, which we |
| 310 | | - # don't want to do. |
| | 307 | + // HACK: We create a new Article object here because getRevIdFetched() |
| | 308 | + // refuses to be run twice, and because Title::getLatestRevId() |
| | 309 | + // won't fetch from the master unless we select for update, which we |
| | 310 | + // don't want to do. |
| 311 | 311 | $newArticle = new Article( $titleObj ); |
| 312 | 312 | $newRevId = $newArticle->getRevIdFetched(); |
| 313 | 313 | if ( $newRevId == $oldRevId ) |
| — | — | @@ -321,13 +321,13 @@ |
| 322 | 322 | break; |
| 323 | 323 | |
| 324 | 324 | case EditPage::AS_END: |
| 325 | | - # This usually means some kind of race condition |
| 326 | | - # or DB weirdness occurred. Fall through to throw an unknown |
| 327 | | - # error. |
| | 325 | + // This usually means some kind of race condition |
| | 326 | + // or DB weirdness occurred. Fall through to throw an unknown |
| | 327 | + // error. |
| 328 | 328 | |
| 329 | | - # This needs fixing higher up, as Article::doEdit should be |
| 330 | | - # used rather than Article::updateArticle, so that specific |
| 331 | | - # error conditions can be returned |
| | 329 | + // This needs fixing higher up, as Article::doEdit should be |
| | 330 | + // used rather than Article::updateArticle, so that specific |
| | 331 | + // error conditions can be returned |
| 332 | 332 | default: |
| 333 | 333 | $this->dieUsageMsg( array( 'unknownerror', $retval ) ); |
| 334 | 334 | } |
| Index: trunk/phase3/includes/api/ApiFormatBase.php |
| — | — | @@ -243,7 +243,7 @@ |
| 244 | 244 | $text = preg_replace( '/\<(!--.*?--|.*?)\>/', '<span style="color:blue;"><\1></span>', $text ); |
| 245 | 245 | // identify URLs |
| 246 | 246 | $protos = implode( "|", $wgUrlProtocols ); |
| 247 | | - # This regex hacks around bug 13218 (" included in the URL) |
| | 247 | + // This regex hacks around bug 13218 (" included in the URL) |
| 248 | 248 | $text = preg_replace( "#(($protos).*?)(")?([ \\'\"<>\n]|<|>|")#", '<a href="\\1">\\1</a>\\3\\4', $text ); |
| 249 | 249 | // identify requests to api.php |
| 250 | 250 | $text = preg_replace( "#api\\.php\\?[^ \\()<\n\t]+#", '<a href="\\0">\\0</a>', $text ); |
| Index: trunk/phase3/includes/api/ApiQueryImages.php |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | "il_to >= '$ilto')" ); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | | - # Don't order by il_from if it's constant in the WHERE clause |
| | 76 | + // Don't order by il_from if it's constant in the WHERE clause |
| 77 | 77 | if ( count( $this->getPageSet()->getGoodTitles() ) == 1 ) |
| 78 | 78 | $this->addOption( 'ORDER BY', 'il_to' ); |
| 79 | 79 | else |
| Index: trunk/phase3/includes/api/ApiQueryRandom.php |
| — | — | @@ -77,9 +77,9 @@ |
| 78 | 78 | array( 'query', $this->getModuleName() ), |
| 79 | 79 | null, $this->extractRowInfo( $row ) ); |
| 80 | 80 | if ( !$fit ) |
| 81 | | - # We can't really query-continue a random list. |
| 82 | | - # Return an insanely high value so |
| 83 | | - # $count < $limit is false |
| | 81 | + // We can't really query-continue a random list. |
| | 82 | + // Return an insanely high value so |
| | 83 | + // $count < $limit is false |
| 84 | 84 | return 1E9; |
| 85 | 85 | $this->pageIDs[] = $row->page_id; |
| 86 | 86 | } |
| Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php |
| — | — | @@ -91,8 +91,8 @@ |
| 92 | 92 | } |
| 93 | 93 | if ( !$fit ) |
| 94 | 94 | { |
| 95 | | - # Abuse siprop as a query-continue parameter |
| 96 | | - # and set it to all unprocessed props |
| | 95 | + // Abuse siprop as a query-continue parameter |
| | 96 | + // and set it to all unprocessed props |
| 97 | 97 | $this->setContinueEnumParameter( 'prop', implode( '|', |
| 98 | 98 | array_diff( $params['prop'], $done ) ) ); |
| 99 | 99 | break; |
| Index: trunk/phase3/includes/api/ApiQueryLangLinks.php |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | "ll_lang >= '$lllang')" ); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | | - # Don't order by ll_from if it's constant in the WHERE clause |
| | 68 | + // Don't order by ll_from if it's constant in the WHERE clause |
| 69 | 69 | if ( count( $this->getPageSet()->getGoodTitles() ) == 1 ) |
| 70 | 70 | $this->addOption( 'ORDER BY', 'll_lang' ); |
| 71 | 71 | else |
| Index: trunk/phase3/includes/api/ApiParse.php |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | { |
| 62 | 62 | if ( !is_null( $oldid ) ) |
| 63 | 63 | { |
| 64 | | - # Don't use the parser cache |
| | 64 | + // Don't use the parser cache |
| 65 | 65 | $rev = Revision::newFromID( $oldid ); |
| 66 | 66 | if ( !$rev ) |
| 67 | 67 | $this->dieUsage( "There is no revision ID $oldid", 'missingrev' ); |
| Index: trunk/phase3/includes/api/ApiQueryImageInfo.php |
| — | — | @@ -95,11 +95,11 @@ |
| 96 | 96 | if ( !$fit ) |
| 97 | 97 | { |
| 98 | 98 | if ( count( $pageIds[NS_IMAGE] ) == 1 ) |
| 99 | | - # The user is screwed. imageinfo can't be solely |
| 100 | | - # responsible for exceeding the limit in this case, |
| 101 | | - # so set a query-continue that just returns the same |
| 102 | | - # thing again. When the violating queries have been |
| 103 | | - # out-continued, the result will get through |
| | 99 | + // The user is screwed. imageinfo can't be solely |
| | 100 | + // responsible for exceeding the limit in this case, |
| | 101 | + // so set a query-continue that just returns the same |
| | 102 | + // thing again. When the violating queries have been |
| | 103 | + // out-continued, the result will get through |
| 104 | 104 | $this->setContinueEnumParameter( 'start', |
| 105 | 105 | wfTimestamp( TS_ISO_8601, $img->getTimestamp() ) ); |
| 106 | 106 | else |
| — | — | @@ -119,7 +119,7 @@ |
| 120 | 120 | if ( !$fit ) |
| 121 | 121 | { |
| 122 | 122 | if ( count( $pageIds[NS_IMAGE] ) == 1 ) |
| 123 | | - # See the 'the user is screwed' comment above |
| | 123 | + // See the 'the user is screwed' comment above |
| 124 | 124 | $this->setContinueEnumParameter( 'start', |
| 125 | 125 | wfTimestamp( TS_ISO_8601, $img->getTimestamp() ) ); |
| 126 | 126 | else |
| Index: trunk/phase3/includes/api/ApiMain.php |
| — | — | @@ -284,7 +284,7 @@ |
| 285 | 285 | |
| 286 | 286 | if ( $this->mSquidMaxage == - 1 ) |
| 287 | 287 | { |
| 288 | | - # Nobody called setCacheMaxAge(), use the (s)maxage parameters |
| | 288 | + // Nobody called setCacheMaxAge(), use the (s)maxage parameters |
| 289 | 289 | $smaxage = $this->getParameter( 'smaxage' ); |
| 290 | 290 | $maxage = $this->getParameter( 'maxage' ); |
| 291 | 291 | } |
| Index: trunk/phase3/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -183,7 +183,7 @@ |
| 184 | 184 | $this->addWhere( 'rc_user_text != ' . $this->getDB()->addQuotes( $params['excludeuser'] ) ); |
| 185 | 185 | |
| 186 | 186 | |
| 187 | | - # This is an index optimization for mysql, as done in the Special:Watchlist page |
| | 187 | + // This is an index optimization for mysql, as done in the Special:Watchlist page |
| 188 | 188 | $this->addWhereIf( "rc_timestamp > ''", !isset ( $params['start'] ) && !isset ( $params['end'] ) && $wgDBtype == 'mysql' ); |
| 189 | 189 | |
| 190 | 190 | $this->addOption( 'LIMIT', $params['limit'] + 1 ); |
| Index: trunk/phase3/includes/api/ApiQueryBase.php |
| — | — | @@ -365,7 +365,7 @@ |
| 366 | 366 | * @return string Page title with underscores |
| 367 | 367 | */ |
| 368 | 368 | public function titleToKey( $title ) { |
| 369 | | - # Don't throw an error if we got an empty string |
| | 369 | + // Don't throw an error if we got an empty string |
| 370 | 370 | if ( trim( $title ) == '' ) |
| 371 | 371 | return ''; |
| 372 | 372 | $t = Title::newFromText( $title ); |
| — | — | @@ -380,11 +380,11 @@ |
| 381 | 381 | * @return string Page title with spaces |
| 382 | 382 | */ |
| 383 | 383 | public function keyToTitle( $key ) { |
| 384 | | - # Don't throw an error if we got an empty string |
| | 384 | + // Don't throw an error if we got an empty string |
| 385 | 385 | if ( trim( $key ) == '' ) |
| 386 | 386 | return ''; |
| 387 | 387 | $t = Title::newFromDbKey( $key ); |
| 388 | | - # This really shouldn't happen but we gotta check anyway |
| | 388 | + // This really shouldn't happen but we gotta check anyway |
| 389 | 389 | if ( !$t ) |
| 390 | 390 | $this->dieUsageMsg( array( 'invalidtitle', $key ) ); |
| 391 | 391 | return $t->getPrefixedText(); |
| Index: trunk/phase3/includes/api/ApiQueryBlocks.php |
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | list( $ip, $range ) = IP::parseCIDR( $params['ip'] ); |
| 102 | 102 | if ( $ip && $range ) |
| 103 | 103 | { |
| 104 | | - # We got a CIDR range |
| | 104 | + // We got a CIDR range |
| 105 | 105 | if ( $range < 16 ) |
| 106 | 106 | $this->dieUsage( 'CIDR ranges broader than /16 are not accepted', 'cidrtoobroad' ); |
| 107 | 107 | $lower = wfBaseConvert( $ip, 10, 16, 8, false ); |
| Index: trunk/phase3/includes/api/ApiQueryRevisions.php |
| — | — | @@ -396,9 +396,9 @@ |
| 397 | 397 | if ( $this->fld_content || !is_null( $this->difftotext ) ) { |
| 398 | 398 | global $wgParser; |
| 399 | 399 | $text = $revision->getText(); |
| 400 | | - # Expand templates after getting section content because |
| 401 | | - # template-added sections don't count and Parser::preprocess() |
| 402 | | - # will have less input |
| | 400 | + // Expand templates after getting section content because |
| | 401 | + // template-added sections don't count and Parser::preprocess() |
| | 402 | + // will have less input |
| 403 | 403 | if ( $this->section !== false ) { |
| 404 | 404 | $text = $wgParser->getSection( $text, $this->section, false ); |
| 405 | 405 | if ( $text === false ) |
| — | — | @@ -541,7 +541,7 @@ |
| 542 | 542 | ' 1) Get data about a set of pages (last revision), by setting titles or pageids parameter.', |
| 543 | 543 | ' 2) Get revisions for one given page, by using titles/pageids with start/end/limit params.', |
| 544 | 544 | ' 3) Get data about a set of revisions by setting their IDs with revids parameter.', |
| 545 | | - 'All parameters marked as (enum) may only be used with a single page (#2).' |
| | 545 | + 'All parameters marked as (enum) may only be used with a single page (//2).' |
| 546 | 546 | ); |
| 547 | 547 | } |
| 548 | 548 | |
| Index: trunk/phase3/includes/api/ApiQueryExternalLinks.php |
| — | — | @@ -52,7 +52,7 @@ |
| 53 | 53 | $this->addTables( 'externallinks' ); |
| 54 | 54 | $this->addWhereFld( 'el_from', array_keys( $this->getPageSet()->getGoodTitles() ) ); |
| 55 | 55 | |
| 56 | | - # Don't order by el_from if it's constant in the WHERE clause |
| | 56 | + // Don't order by el_from if it's constant in the WHERE clause |
| 57 | 57 | if ( count( $this->getPageSet()->getGoodTitles() ) != 1 ) |
| 58 | 58 | $this->addOption( 'ORDER BY', 'el_from' ); |
| 59 | 59 | |
| Index: trunk/phase3/includes/api/ApiBase.php |
| — | — | @@ -175,12 +175,12 @@ |
| 176 | 176 | $data = $this->getResult()->getData(); |
| 177 | 177 | if ( isset( $data['warnings'][$this->getModuleName()] ) ) |
| 178 | 178 | { |
| 179 | | - # Don't add duplicate warnings |
| | 179 | + // Don't add duplicate warnings |
| 180 | 180 | $warn_regex = preg_quote( $warning, '/' ); |
| 181 | 181 | if ( preg_match( "/{$warn_regex}(\\n|$)/", $data['warnings'][$this->getModuleName()]['*'] ) ) |
| 182 | 182 | return; |
| 183 | 183 | $oldwarning = $data['warnings'][$this->getModuleName()]['*']; |
| 184 | | - # If there is a warning already, append it to the existing one |
| | 184 | + // If there is a warning already, append it to the existing one |
| 185 | 185 | $warning = "$oldwarning\n$warning"; |
| 186 | 186 | $this->getResult()->unsetValue( 'warnings', $this->getModuleName() ); |
| 187 | 187 | } |
| — | — | @@ -668,7 +668,7 @@ |
| 669 | 669 | } |
| 670 | 670 | |
| 671 | 671 | if ( is_array( $allowedValues ) ) { |
| 672 | | - # Check for unknown values |
| | 672 | + // Check for unknown values |
| 673 | 673 | $unknown = array_diff( $valuesList, $allowedValues ); |
| 674 | 674 | if ( count( $unknown ) ) |
| 675 | 675 | { |
| — | — | @@ -681,7 +681,7 @@ |
| 682 | 682 | else |
| 683 | 683 | $this->dieUsage( "Unrecognized value for parameter '$valueName': {$valuesList[0]}", "unknown_$valueName" ); |
| 684 | 684 | } |
| 685 | | - # Now throw them out |
| | 685 | + // Now throw them out |
| 686 | 686 | $valuesList = array_intersect( $valuesList, $allowedValues ); |
| 687 | 687 | } |
| 688 | 688 | |
| Index: trunk/phase3/includes/api/ApiFormatTxt.php |
| — | — | @@ -38,9 +38,9 @@ |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function getMimeType() { |
| 42 | | - # This looks like it should be text/plain, but IE7 is so |
| 43 | | - # brain-damaged it tries to parse text/plain as HTML if it |
| 44 | | - # contains HTML tags. Using MIME text/text works around this bug |
| | 42 | + // This looks like it should be text/plain, but IE7 is so |
| | 43 | + // brain-damaged it tries to parse text/plain as HTML if it |
| | 44 | + // contains HTML tags. Using MIME text/text works around this bug |
| 45 | 45 | return 'text/text'; |
| 46 | 46 | } |
| 47 | 47 | |