http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74035
Revision: 74035
Author: demon
Date: 2010-09-30 19:14:11 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
Follow up r74034: Refactor GAID_FOR_UPDATE into Title::GAID_FOR_UPDATE. Yay
less file-scope code (for extensions)
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedArticle.php
trunk/extensions/FlaggedRevs/FlaggedArticleView.php
trunk/extensions/FlaggedRevs/FlaggedRevision.php
trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php
trunk/extensions/GlobalUsage/GlobalUsageHooks.php
trunk/extensions/GlobalUsage/GlobalUsage_body.php
trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php
trunk/extensions/MirrorTools/MirrorTools.classes.php
trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
trunk/extensions/Translate/tag/SpecialPageTranslationMovePage.php
trunk/extensions/Wikilog/WikilogComment.php
trunk/extensions/Wikilog/WikilogCommentsPage.php
Modified: trunk/extensions/FlaggedRevs/FlaggedArticle.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedArticle.php 2010-09-30 19:13:25 UTC
(rev 74034)
+++ trunk/extensions/FlaggedRevs/FlaggedArticle.php 2010-09-30 19:14:11 UTC
(rev 74035)
@@ -109,7 +109,7 @@
$srev = $this->getStableRev( $flags );
if ( $srev ) {
if ( $flags & FR_MASTER ) {
- $latest =
$this->getTitle()->getLatestRevID( GAID_FOR_UPDATE );
+ $latest =
$this->getTitle()->getLatestRevID( Title::GAID_FOR_UPDATE );
} else {
$latest = $this->getLatest();
}
Modified: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-09-30 19:13:25 UTC
(rev 74034)
+++ trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-09-30 19:14:11 UTC
(rev 74035)
@@ -1584,7 +1584,7 @@
return true;
}
# Get latest revision Id (lag safe)
- $latest = $this->article->getTitle()->getLatestRevID(
GAID_FOR_UPDATE );
+ $latest = $this->article->getTitle()->getLatestRevID(
Title::GAID_FOR_UPDATE );
if ( $latest == $frev->getRevId() ) {
return true; // only for pages with pending edits
}
@@ -1779,7 +1779,7 @@
# We are undoing all edits *after* some rev ID
(undoafter).
# If undoafter is not given, then it is the
previous rev ID.
$revId = $wgRequest->getInt( 'undoafter',
-
$article->getTitle()->getPreviousRevisionID( $latestId, GAID_FOR_UPDATE ) );
+
$article->getTitle()->getPreviousRevisionID( $latestId, Title::GAID_FOR_UPDATE
) );
# Undoing other edits...
} elseif ( $undo ) {
$revId = $latestId; // current rev is the base
rev
Modified: trunk/extensions/FlaggedRevs/FlaggedRevision.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-09-30 19:13:25 UTC
(rev 74034)
+++ trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-09-30 19:14:11 UTC
(rev 74035)
@@ -96,7 +96,7 @@
} else {
$db = wfGetDB( DB_SLAVE );
}
- $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ?
GAID_FOR_UPDATE : 0 );
+ $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ?
Title::GAID_FOR_UPDATE : 0 );
# Short-circuit query
if ( !$pageId ) {
return null;
@@ -134,7 +134,7 @@
}
$columns = self::selectFields();
$options = array();
- $pageId = $title->getArticleID( $flags & FR_MASTER ?
GAID_FOR_UPDATE : 0 );
+ $pageId = $title->getArticleID( $flags & FR_MASTER ?
Title::GAID_FOR_UPDATE : 0 );
if ( !$pageId ) {
return null; // short-circuit query
}
@@ -181,7 +181,7 @@
}
$columns = self::selectFields();
$options = array();
- $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ?
GAID_FOR_UPDATE : 0 );
+ $pageId = $title->getArticleID( $flags & FR_FOR_UPDATE ?
Title::GAID_FOR_UPDATE : 0 );
if ( !$pageId ) {
return null; // short-circuit query
}
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2010-09-30 19:13:25 UTC
(rev 74034)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2010-09-30 19:14:11 UTC
(rev 74035)
@@ -716,7 +716,7 @@
}
# Get the latest revision ID if not set
if ( !$latest ) {
- $latest = $article->getTitle()->getLatestRevID(
GAID_FOR_UPDATE );
+ $latest = $article->getTitle()->getLatestRevID(
Title::GAID_FOR_UPDATE );
}
# Get the highest quality revision (not necessarily this one)
$dbw = wfGetDB( DB_MASTER );
@@ -776,7 +776,7 @@
}
# Get the latest revision ID if not set
if ( !$latest ) {
- $latest = $article->getTitle()->getLatestRevID(
GAID_FOR_UPDATE );
+ $latest = $article->getTitle()->getLatestRevID(
Title::GAID_FOR_UPDATE );
}
$pageId = $article->getId();
# Update pending times for each level, going from highest to
lowest
Modified: trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php 2010-09-30
19:13:25 UTC (rev 74034)
+++ trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php 2010-09-30
19:14:11 UTC (rev 74035)
@@ -290,7 +290,7 @@
protected function updateLogsAndHistory( $reset ) {
global $wgContLang;
$article = new Article( $this->page );
- $latest = $this->page->getLatestRevID( GAID_FOR_UPDATE );
+ $latest = $this->page->getLatestRevID( Title::GAID_FOR_UPDATE );
# Config may have changed to allow stable versions.
# Refresh tracking to account for any hidden reviewed
versions...
$frev = FlaggedRevision::newFromStable( $this->page, FR_MASTER
);
Modified: trunk/extensions/GlobalUsage/GlobalUsageHooks.php
===================================================================
--- trunk/extensions/GlobalUsage/GlobalUsageHooks.php 2010-09-30 19:13:25 UTC
(rev 74034)
+++ trunk/extensions/GlobalUsage/GlobalUsageHooks.php 2010-09-30 19:14:11 UTC
(rev 74035)
@@ -24,11 +24,11 @@
$gu = self::getGlobalUsage();
if ( $wgUseDumbLinkUpdate ) {
// Delete all entries to the page
- $gu->deleteLinksFromPage( $title->getArticleId(
GAID_FOR_UPDATE ) );
+ $gu->deleteLinksFromPage( $title->getArticleId(
Title::GAID_FOR_UPDATE ) );
// Re-insert new usage for the page
$gu->insertLinks( $title, $missingFiles );
} else {
- $articleId = $title->getArticleId( GAID_FOR_UPDATE );
+ $articleId = $title->getArticleId(
Title::GAID_FOR_UPDATE );
$existing = $gu->getLinksFromPage( $articleId );
// Calculate changes
Modified: trunk/extensions/GlobalUsage/GlobalUsage_body.php
===================================================================
--- trunk/extensions/GlobalUsage/GlobalUsage_body.php 2010-09-30 19:13:25 UTC
(rev 74034)
+++ trunk/extensions/GlobalUsage/GlobalUsage_body.php 2010-09-30 19:14:11 UTC
(rev 74035)
@@ -21,7 +21,7 @@
* @param $title Title Title of the page
* @param $images array Array of db keys of images used
*/
- public function insertLinks( $title, $images, $pageIdFlags =
GAID_FOR_UPDATE ) {
+ public function insertLinks( $title, $images, $pageIdFlags =
Title::GAID_FOR_UPDATE ) {
$insert = array();
foreach ( $images as $name ) {
$insert[] = array(
Modified: trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php
===================================================================
--- trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php 2010-09-30
19:13:25 UTC (rev 74034)
+++ trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php 2010-09-30
19:14:11 UTC (rev 74035)
@@ -82,7 +82,7 @@
$title = Title::newFromRow( reset(
$rows ) );
$images = array_keys( $rows );
# Since we have a pretty accurate
page_id, don't specify
- # GAID_FOR_UPDATE
+ # Title::GAID_FOR_UPDATE
$gu->insertLinks( $title, $images, /*
$flags */ 0 );
}
}
Modified: trunk/extensions/MirrorTools/MirrorTools.classes.php
===================================================================
--- trunk/extensions/MirrorTools/MirrorTools.classes.php 2010-09-30
19:13:25 UTC (rev 74034)
+++ trunk/extensions/MirrorTools/MirrorTools.classes.php 2010-09-30
19:14:11 UTC (rev 74035)
@@ -109,7 +109,7 @@
wfProfileOut( __METHOD__ . '-checks' );
# If article is new, insert it.
- $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
+ $aid = $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE );
if ( 0 == $aid ) {
// Late check for create permission, just in case
*PARANOIA*
if ( !$this->mTitle->userCan( 'create' ) ) {
Modified: trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
===================================================================
--- trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
2010-09-30 19:13:25 UTC (rev 74034)
+++ trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
2010-09-30 19:14:11 UTC (rev 74035)
@@ -230,7 +230,7 @@
static $stackDepth = 0;
$userVoted = false;
# Use page_latest if $revId not given
- $revId = $revId ? $revId : $title->getLatestRevID(
GAID_FOR_UPDATE );
+ $revId = $revId ? $revId : $title->getLatestRevID(
Title::GAID_FOR_UPDATE );
$rev = Revision::newFromTitle( $title, $revId );
if( !$rev ) return false; // shouldn't happen; just in case
# Check if this revision is by this user...
Modified: trunk/extensions/Translate/tag/SpecialPageTranslationMovePage.php
===================================================================
--- trunk/extensions/Translate/tag/SpecialPageTranslationMovePage.php
2010-09-30 19:13:25 UTC (rev 74034)
+++ trunk/extensions/Translate/tag/SpecialPageTranslationMovePage.php
2010-09-30 19:14:11 UTC (rev 74035)
@@ -375,10 +375,10 @@
MoveJob::forceRedirects( true );
$newTpage = TranslatablePage::newFromTitle( $this->newTitle );
- $newTpage->addReadyTag( $this->newTitle->getLatestRevId(
GAID_FOR_UPDATE ) );
+ $newTpage->addReadyTag( $this->newTitle->getLatestRevId(
Title::GAID_FOR_UPDATE ) );
if ( $newTpage->getMarkedTag() === $oldLatest ) {
- $newTpage->addMarkedTag(
$this->newTitle->getLatestRevId( GAID_FOR_UPDATE ) );
+ $newTpage->addMarkedTag(
$this->newTitle->getLatestRevId( Title::GAID_FOR_UPDATE ) );
}
MessageGroups::clearCache();
Modified: trunk/extensions/Wikilog/WikilogComment.php
===================================================================
--- trunk/extensions/Wikilog/WikilogComment.php 2010-09-30 19:13:25 UTC (rev
74034)
+++ trunk/extensions/Wikilog/WikilogComment.php 2010-09-30 19:14:11 UTC (rev
74035)
@@ -243,7 +243,7 @@
if ( $this->mCommentTitle ) {
return $this->mCommentTitle;
} else if ( $this->mCommentPage ) {
- return Title::newFromID( $this->mCommentPage,
GAID_FOR_UPDATE );
+ return Title::newFromID( $this->mCommentPage,
Title::GAID_FOR_UPDATE );
} else {
$it = $this->mItem->mTitle;
return Title::makeTitle(
Modified: trunk/extensions/Wikilog/WikilogCommentsPage.php
===================================================================
--- trunk/extensions/Wikilog/WikilogCommentsPage.php 2010-09-30 19:13:25 UTC
(rev 74034)
+++ trunk/extensions/Wikilog/WikilogCommentsPage.php 2010-09-30 19:14:11 UTC
(rev 74035)
@@ -399,7 +399,7 @@
array( 'content', 'parsemag' ),
$comment->mUserText
);
- $id = $title->getArticleID( GAID_FOR_UPDATE );
+ $id = $title->getArticleID( Title::GAID_FOR_UPDATE );
if ( $this->doDeleteArticle( $reason, false, $id ) ) {
$comment->deleteComment();
$log->addEntry( 'c-reject', $title, '' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
