| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticle.php |
| — | — | @@ -109,7 +109,7 @@ |
| 110 | 110 | $srev = $this->getStableRev( $flags ); |
| 111 | 111 | if ( $srev ) { |
| 112 | 112 | if ( $flags & FR_MASTER ) { |
| 113 | | - $latest = $this->getTitle()->getLatestRevID( Title::GAID_FOR_UPDATE ); |
| | 113 | + $latest = $this->getTitle()->getLatestRevID( GAID_FOR_UPDATE ); |
| 114 | 114 | } else { |
| 115 | 115 | $latest = $this->getLatest(); |
| 116 | 116 | } |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.class.php |
| — | — | @@ -698,7 +698,7 @@ |
| 699 | 699 | } |
| 700 | 700 | # Get the latest revision ID if not set |
| 701 | 701 | if ( !$latest ) { |
| 702 | | - $latest = $article->getTitle()->getLatestRevID( Title::GAID_FOR_UPDATE ); |
| | 702 | + $latest = $article->getTitle()->getLatestRevID( GAID_FOR_UPDATE ); |
| 703 | 703 | } |
| 704 | 704 | # Get the highest quality revision (not necessarily this one) |
| 705 | 705 | $dbw = wfGetDB( DB_MASTER ); |
| — | — | @@ -758,7 +758,7 @@ |
| 759 | 759 | } |
| 760 | 760 | # Get the latest revision ID if not set |
| 761 | 761 | if ( !$latest ) { |
| 762 | | - $latest = $article->getTitle()->getLatestRevID( Title::GAID_FOR_UPDATE ); |
| | 762 | + $latest = $article->getTitle()->getLatestRevID( GAID_FOR_UPDATE ); |
| 763 | 763 | } |
| 764 | 764 | $pageId = $article->getId(); |
| 765 | 765 | # Update pending times for each level, going from highest to lowest |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/forms/PageStabilityForm.php |
| — | — | @@ -290,7 +290,7 @@ |
| 291 | 291 | protected function updateLogsAndHistory( $reset ) { |
| 292 | 292 | global $wgContLang; |
| 293 | 293 | $article = new Article( $this->page ); |
| 294 | | - $latest = $this->page->getLatestRevID( Title::GAID_FOR_UPDATE ); |
| | 294 | + $latest = $this->page->getLatestRevID( GAID_FOR_UPDATE ); |
| 295 | 295 | # Config may have changed to allow stable versions. |
| 296 | 296 | # Refresh tracking to account for any hidden reviewed versions... |
| 297 | 297 | $frev = FlaggedRevision::newFromStable( $this->page, FR_MASTER ); |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevision.php |
| — | — | @@ -96,7 +96,7 @@ |
| 97 | 97 | } else { |
| 98 | 98 | $db = wfGetDB( DB_SLAVE ); |
| 99 | 99 | } |
| 100 | | - $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ? Title::GAID_FOR_UPDATE : 0 ); |
| | 100 | + $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ? GAID_FOR_UPDATE : 0 ); |
| 101 | 101 | # Short-circuit query |
| 102 | 102 | if ( !$pageId ) { |
| 103 | 103 | return null; |
| — | — | @@ -134,7 +134,7 @@ |
| 135 | 135 | } |
| 136 | 136 | $columns = self::selectFields(); |
| 137 | 137 | $options = array(); |
| 138 | | - $pageId = $title->getArticleID( $flags & FR_MASTER ? Title::GAID_FOR_UPDATE : 0 ); |
| | 138 | + $pageId = $title->getArticleID( $flags & FR_MASTER ? GAID_FOR_UPDATE : 0 ); |
| 139 | 139 | if ( !$pageId ) { |
| 140 | 140 | return null; // short-circuit query |
| 141 | 141 | } |
| — | — | @@ -181,7 +181,7 @@ |
| 182 | 182 | } |
| 183 | 183 | $columns = self::selectFields(); |
| 184 | 184 | $options = array(); |
| 185 | | - $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ? Title::GAID_FOR_UPDATE : 0 ); |
| | 185 | + $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ? GAID_FOR_UPDATE : 0 ); |
| 186 | 186 | if ( !$pageId ) { |
| 187 | 187 | return null; // short-circuit query |
| 188 | 188 | } |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php |
| — | — | @@ -270,14 +270,6 @@ |
| 271 | 271 | $fields[] = 'cl_sortkey'; |
| 272 | 272 | $conds['cl_to'] = $this->category; |
| 273 | 273 | $conds[] = 'cl_from = page_id'; |
| 274 | | - # Note: single NS always specified |
| 275 | | - if( $this->namespace == NS_FILE ) { |
| 276 | | - $conds['cl_type'] = 'file'; |
| 277 | | - } elseif( $this->namespace == NS_CATEGORY ) { |
| 278 | | - $conds['cl_type'] = 'subcat'; |
| 279 | | - } else { |
| 280 | | - $conds['cl_type'] = 'page'; |
| 281 | | - } |
| 282 | 274 | $this->mIndexField = 'cl_sortkey'; |
| 283 | 275 | $useIndex = array( 'categorylinks' => 'cl_sortkey' ); |
| 284 | 276 | $groupBy = 'cl_sortkey,cl_from'; |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1569,7 +1569,7 @@ |
| 1570 | 1570 | return true; |
| 1571 | 1571 | } |
| 1572 | 1572 | # Get latest revision Id (lag safe) |
| 1573 | | - $latest = $this->article->getTitle()->getLatestRevID( Title::GAID_FOR_UPDATE ); |
| | 1573 | + $latest = $this->article->getTitle()->getLatestRevID( GAID_FOR_UPDATE ); |
| 1574 | 1574 | if ( $latest == $frev->getRevId() ) { |
| 1575 | 1575 | return true; // only for pages with pending edits |
| 1576 | 1576 | } |
| — | — | @@ -1764,7 +1764,7 @@ |
| 1765 | 1765 | # We are undoing all edits *after* some rev ID (undoafter). |
| 1766 | 1766 | # If undoafter is not given, then it is the previous rev ID. |
| 1767 | 1767 | $revId = $wgRequest->getInt( 'undoafter', |
| 1768 | | - $article->getTitle()->getPreviousRevisionID( $latestId, Title::GAID_FOR_UPDATE ) ); |
| | 1768 | + $article->getTitle()->getPreviousRevisionID( $latestId, GAID_FOR_UPDATE ) ); |
| 1769 | 1769 | # Undoing other edits... |
| 1770 | 1770 | } elseif ( $undo ) { |
| 1771 | 1771 | $revId = $latestId; // current rev is the base rev |