https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113583
Revision: 113583
Author: reedy
Date: 2012-03-11 19:04:37 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Bug 35156 - Harmonise spelling of getArticleID() and getArticleId()
Mass change ->getArticleId() to ->getArticleID()
Modified Paths:
--------------
trunk/extensions/AbuseFilter/AbuseFilter.class.php
trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php
trunk/extensions/ApprovedRevs/ApprovedRevs_body.php
trunk/extensions/AuthorProtect/AuthorProtect.php
trunk/extensions/CategoryTree/CategoryTreeFunctions.php
trunk/extensions/ChangeAuthor/ChangeAuthor.body.php
trunk/extensions/ConfirmEdit/Captcha.php
trunk/extensions/Contributors/Contributors.page.php
trunk/extensions/DeleteQueue/DeleteQueue.hooks.php
trunk/extensions/DidYouMean/DidYouMean.hooks.php
trunk/extensions/Drafts/Drafts.classes.php
trunk/extensions/Duplicator/Duplicator.page.php
trunk/extensions/EditConflict/EditConflict.php
trunk/extensions/EditOwn/EditOwn.php
trunk/extensions/EditSimilar/EditSimilar.php
trunk/extensions/FileSearch/FileSearchIndexer.php
trunk/extensions/FlagPage/FlagPage.body.php
trunk/extensions/FlaggedRevs/backend/FRDependencyUpdate.php
trunk/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php
trunk/extensions/FlaggedRevs/business/PageStabilityForm.php
trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
trunk/extensions/GlobalUsage/GlobalUsageHooks.php
trunk/extensions/JSKit/JSKit.php
trunk/extensions/LiquidThreads/classes/Dispatch.php
trunk/extensions/LiquidThreads/classes/Hooks.php
trunk/extensions/LiquidThreads/classes/Thread.php
trunk/extensions/MeanEditor/MeanEditorEditPage.body.php
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
trunk/extensions/OAI/OAIHarvest.php
trunk/extensions/OpenStackManager/OpenStackNovaProject.php
trunk/extensions/PageInCat/PageInCat_body.php
trunk/extensions/Patroller/Patroller.class.php
trunk/extensions/Ratings/Ratings.class.php
trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
trunk/extensions/SemanticForms/includes/SF_Utils.php
trunk/extensions/SemanticPageSeries/includes/SPSUtils.php
trunk/extensions/SpamBlacklist/SpamBlacklist_body.php
trunk/extensions/Translate/MessageGroups.php
trunk/extensions/Translate/TranslateEditAddons.php
trunk/extensions/Translate/tag/PageTranslationHooks.php
trunk/extensions/Translate/tag/SpecialPageTranslation.php
trunk/extensions/Translate/tag/TranslatablePage.php
trunk/extensions/Translate/utils/TranslationHelpers.php
trunk/extensions/WikiSync/WikiSyncExporter.php
trunk/extensions/Wikilog/WikilogFeed.php
trunk/extensions/Wikilog/WikilogHooks.php
trunk/extensions/Wikilog/WikilogMainPage.php
trunk/extensions/Wikilog/WikilogQuery.php
trunk/extensions/Wikilog/WikilogUtils.php
trunk/extensions/skins/Nimbus/Nimbus.skin.php
Modified: trunk/extensions/AbuseFilter/AbuseFilter.class.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.class.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/AbuseFilter/AbuseFilter.class.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -254,7 +254,7 @@
return new AbuseFilterVariableHolder;
}
- $vars->setVar( $prefix . '_ARTICLEID', $title->getArticleId() );
+ $vars->setVar( $prefix . '_ARTICLEID', $title->getArticleID() );
$vars->setVar( $prefix . '_NAMESPACE', $title->getNamespace() );
$vars->setVar( $prefix . '_TEXT', $title->getText() );
$vars->setVar( $prefix . '_PREFIXEDTEXT',
$title->getPrefixedText() );
Modified: trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/AbuseFilter/AbuseFilterVariableHolder.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -318,7 +318,7 @@
$res = $dbr->select( 'revision',
'DISTINCT rev_user_text',
array(
- 'rev_page' =>
$title->getArticleId(),
+ 'rev_page' =>
$title->getArticleID(),
'rev_timestamp<' .
$dbr->addQuotes( $dbr->timestamp( $cutOff ) )
),
__METHOD__,
Modified: trunk/extensions/ApprovedRevs/ApprovedRevs_body.php
===================================================================
--- trunk/extensions/ApprovedRevs/ApprovedRevs_body.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/ApprovedRevs/ApprovedRevs_body.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -19,7 +19,7 @@
* one.
*/
public static function getApprovedRevID( $title ) {
- $pageID = $title->getArticleId();
+ $pageID = $title->getArticleID();
if ( array_key_exists( $pageID, self::$mApprovedRevIDForPage )
) {
return self::$mApprovedRevIDForPage[$pageID];
}
@@ -47,7 +47,7 @@
* if there isn't one.
*/
public static function getApprovedContent( $title ) {
- $pageID = $title->getArticleId();
+ $pageID = $title->getArticleID();
if ( array_key_exists( $pageID, self::$mApprovedContentForPage
) ) {
return self::$mApprovedContentForPage[$pageID];
}
@@ -134,7 +134,7 @@
public static function saveApprovedRevIDInDB( $title, $rev_id ) {
$dbr = wfGetDB( DB_MASTER );
- $page_id = $title->getArticleId();
+ $page_id = $title->getArticleID();
$old_rev_id = $dbr->selectField( 'approved_revs', 'rev_id',
array( 'page_id' => $page_id ) );
if ( $old_rev_id ) {
$dbr->update( 'approved_revs', array( 'rev_id' =>
$rev_id ), array( 'page_id' => $page_id ) );
@@ -185,7 +185,7 @@
public static function deleteRevisionApproval( $title ) {
$dbr = wfGetDB( DB_MASTER );
- $page_id = $title->getArticleId();
+ $page_id = $title->getArticleID();
$dbr->delete( 'approved_revs', array( 'page_id' => $page_id ) );
}
Modified: trunk/extensions/AuthorProtect/AuthorProtect.php
===================================================================
--- trunk/extensions/AuthorProtect/AuthorProtect.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/AuthorProtect/AuthorProtect.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -221,7 +221,7 @@
return false; // don't allow anons, they shouldn't even
get this far but just in case...
}
- $id = $title->getArticleId();
+ $id = $title->getArticleID();
$dbr = wfGetDB( DB_SLAVE ); // grab the slave for reading
$aid = $dbr->selectField( 'revision', 'rev_user', array(
'rev_page' => $id ), __METHOD__ );
return $wgUser->getID() == $aid;
Modified: trunk/extensions/CategoryTree/CategoryTreeFunctions.php
===================================================================
--- trunk/extensions/CategoryTree/CategoryTreeFunctions.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/CategoryTree/CategoryTreeFunctions.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -491,7 +491,7 @@
if ( $inverse ) {
$joins['categorylinks'] = array( 'RIGHT JOIN', array(
'cl_to = page_title', 'page_namespace' => NS_CATEGORY ) );
- $where['cl_from'] = $title->getArticleId();
+ $where['cl_from'] = $title->getArticleID();
} else {
$joins['categorylinks'] = array( 'JOIN', 'cl_from =
page_id' );
$where['cl_to'] = $title->getDBkey();
@@ -681,7 +681,7 @@
$labelClass = 'CategoryTreeLabel ' . ' CategoryTreeLabelNs' .
$ns;
- if ( !$title->getArticleId() ) {
+ if ( !$title->getArticleID() ) {
$labelClass .= ' new';
$wikiLink = $title->getLocalURL(
'action=edit&redlink=1' );
} else {
Modified: trunk/extensions/ChangeAuthor/ChangeAuthor.body.php
===================================================================
--- trunk/extensions/ChangeAuthor/ChangeAuthor.body.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/ChangeAuthor/ChangeAuthor.body.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -219,7 +219,7 @@
$res = $dbr->select(
'revision',
Revision::selectFields(),
- array( 'rev_page' => $title->getArticleId() ),
+ array( 'rev_page' => $title->getArticleID() ),
__METHOD__,
array( 'ORDER BY' => 'rev_timestamp DESC', 'LIMIT' =>
50 )
);
Modified: trunk/extensions/ConfirmEdit/Captcha.php
===================================================================
--- trunk/extensions/ConfirmEdit/Captcha.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/ConfirmEdit/Captcha.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -418,7 +418,7 @@
*/
function getLinksFromTracker( $title ) {
$dbr = wfGetDB( DB_SLAVE );
- $id = $title->getArticleId(); // should be zero queries
+ $id = $title->getArticleID(); // should be zero queries
$res = $dbr->select( 'externallinks', array( 'el_to' ),
array( 'el_from' => $id ), __METHOD__ );
$links = array();
Modified: trunk/extensions/Contributors/Contributors.page.php
===================================================================
--- trunk/extensions/Contributors/Contributors.page.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/Contributors/Contributors.page.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -143,7 +143,7 @@
public static function getContributors($title) {
wfProfileIn( __METHOD__ );
global $wgMemc;
- $k = wfMemcKey( 'contributors', $title->getArticleId() );
+ $k = wfMemcKey( 'contributors', $title->getArticleID() );
$contributors = $wgMemc->get( $k );
if( !$contributors ) {
$contributors = array();
@@ -178,7 +178,7 @@
* @return array
*/
protected static function getConditions($title) {
- $conds['rev_page'] = $title->getArticleId();
+ $conds['rev_page'] = $title->getArticleID();
$conds[] = 'rev_deleted & ' . Revision::DELETED_USER . ' = 0';
return $conds;
}
Modified: trunk/extensions/DeleteQueue/DeleteQueue.hooks.php
===================================================================
--- trunk/extensions/DeleteQueue/DeleteQueue.hooks.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/DeleteQueue/DeleteQueue.hooks.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -16,7 +16,7 @@
}
// Get status
- $dqi = DeleteQueueItem::newFromArticle(
$st->mTitle->getArticleId() );
+ $dqi = DeleteQueueItem::newFromArticle(
$st->mTitle->getArticleID() );
$queue = $dqi->getQueue();
$action = $wgRequest->getText( 'action' );
Modified: trunk/extensions/DidYouMean/DidYouMean.hooks.php
===================================================================
--- trunk/extensions/DidYouMean/DidYouMean.hooks.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/DidYouMean/DidYouMean.hooks.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -182,7 +182,7 @@
# return true;
#}
- DidYouMean::doInsert( $title->getArticleId(), $title->getText()
);
+ DidYouMean::doInsert( $title->getArticleID(), $title->getText()
);
return true;
}
Modified: trunk/extensions/Drafts/Drafts.classes.php
===================================================================
--- trunk/extensions/Drafts/Drafts.classes.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/Drafts/Drafts.classes.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -39,7 +39,7 @@
// Checks if a specific title was given
if ( $title !== null ) {
// Get page id from title
- $pageId = $title->getArticleId();
+ $pageId = $title->getArticleID();
// Checks if page id exists
if ( $pageId ) {
// Adds specific page id to conditions
@@ -101,7 +101,7 @@
'draft_title' => $newTitle->getDBkey()
),
array(
- 'draft_page' => $newTitle->getArticleId()
+ 'draft_page' => $newTitle->getArticleID()
),
__METHOD__
);
@@ -129,7 +129,7 @@
// Checks if specific title was given
if ( $title !== null ) {
// Get page id from title
- $pageId = $title->getArticleId();
+ $pageId = $title->getArticleID();
// Checks if page id exists
if ( $pageId ) {
// Adds specific page id to conditions
@@ -624,7 +624,7 @@
'draft_user' => (int) $wgUser->getID(),
'draft_namespace' => (int) $this->title->getNamespace(),
'draft_title' => (string) $this->title->getDBkey(),
- 'draft_page' => (int) $this->title->getArticleId(),
+ 'draft_page' => (int) $this->title->getArticleID(),
'draft_section' =>
$this->section == '' ? null : (int)
$this->section,
'draft_starttime' => $dbw->timestamp( $this->starttime
),
Modified: trunk/extensions/Duplicator/Duplicator.page.php
===================================================================
--- trunk/extensions/Duplicator/Duplicator.page.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/Duplicator/Duplicator.page.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -94,7 +94,7 @@
# Check there aren't a hideous number of revisions
$dbr = wfGetDB( DB_SLAVE );
- $num = $dbr->selectField( 'revision', 'COUNT(*)',array(
'rev_page' => $this->sourceTitle->getArticleId() ), __METHOD__ );
+ $num = $dbr->selectField( 'revision', 'COUNT(*)',array(
'rev_page' => $this->sourceTitle->getArticleID() ), __METHOD__ );
if( $num <= $wgDuplicatorRevisionLimit ) {
# Attempt to perform the main duplicate op. first
if( $this->duplicate( $this->sourceTitle,
$this->destTitle ) ) {
@@ -205,7 +205,7 @@
return false; # Source doesn't exist, or destination
does
$dbw = wfGetDB( DB_MASTER );
$dbw->begin();
- $sid = $source->getArticleId();
+ $sid = $source->getArticleID();
# Create an article representing the destination page and save
it
$destArticle = new Article( $dest );
$aid = $destArticle->insertOn( $dbw );
Modified: trunk/extensions/EditConflict/EditConflict.php
===================================================================
--- trunk/extensions/EditConflict/EditConflict.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/EditConflict/EditConflict.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -214,7 +214,7 @@
if ( $db->numRows( $res ) > 0 ) {
# ajax runs in minimal (commandline-like) environment,
so $wgTitle during ajax php calls is a mainpage stub
# thus, we are passing real article id of the current
title to ajax js (then to ajax php)
- $notify_list = $title->getArticleId();
+ $notify_list = $title->getArticleID();
while ( $row = $db->fetchObject( $res ) ) {
$notify_list .= ',' . strval( intval(
$row->ns_user_rev_id ) );
}
@@ -270,7 +270,7 @@
$disallow_edit = ( ( $edit_id = self::canUserEdit( $db, $user,
$title ) ) != EC_NO_EDITING ) ? 'true' : 'false';
# ajax runs in minimal (commandline-like) environment, so
$wgTitle during ajax php calls is a mainpage stub
# thus, we are passing real article id of the current title to
ajax js (then to ajax php)
- $article_id = $title->getArticleId();
+ $article_id = $title->getArticleID();
if ( self::$alwaysEditClickEvent || $disallow_edit ) {
# insert ajax check into the edit button anchor, second
parameter indicates whether the article is already edited by privileged user
self::addOnLoadScript( 'EditConflict.findEditKey(' .
$article_id . ',' . $disallow_edit . ');' );
Modified: trunk/extensions/EditOwn/EditOwn.php
===================================================================
--- trunk/extensions/EditOwn/EditOwn.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/EditOwn/EditOwn.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -55,16 +55,16 @@
return true;
}
- if(isset($cache[$user->getName()][$title->getArticleId()]))
+ if(isset($cache[$user->getName()][$title->getArticleID()]))
{
- $result = $cache[$user->getName()][$title->getArticleId()];
+ $result = $cache[$user->getName()][$title->getArticleID()];
return is_null($result);
}
if(!$title->exists())
{
// Creation is allowed
- $cache[$user->getName()][$title->getArticleId()] = null;
+ $cache[$user->getName()][$title->getArticleID()] = null;
$result = null;
return true;
}
@@ -73,24 +73,24 @@
// we'll just do a DB query
$dbr = wfGetDb(DB_SLAVE);
$res = $dbr->select('revision', Revision::selectFields(),
- array('rev_page' => $title->getArticleId()),
+ array('rev_page' => $title->getArticleID()),
__METHOD__, array('ORDER BY' => 'rev_timestamp',
'LIMIT' => 1));
$row = $dbr->fetchObject($res);
if(!$row)
{
// Title with no revs, weird... allow creation
- $cache[$user->getName()][$title->getArticleId()] = null;
+ $cache[$user->getName()][$title->getArticleID()] = null;
$result = null;
return true;
}
$rev = new Revision($row);
if($user->getName() == $rev->getRawUserText()) {
- $cache[$user->getName()][$title->getArticleId()] = null;
+ $cache[$user->getName()][$title->getArticleID()] = null;
$result = null;
return true;
}
- $cache[$user->getName()][$title->getArticleId()] = false;
+ $cache[$user->getName()][$title->getArticleID()] = false;
$result = false;
return false;
}
Modified: trunk/extensions/EditSimilar/EditSimilar.php
===================================================================
--- trunk/extensions/EditSimilar/EditSimilar.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/EditSimilar/EditSimilar.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -85,7 +85,7 @@
$title = $out->getTitle();
$articleTitle = $title->getText();
// here we'll populate the similar articles and links
- $instance = new EditSimilar( $title->getArticleId(),
'category' );
+ $instance = new EditSimilar( $title->getArticleID(),
'category' );
$similarities = $instance->getSimilarArticles();
if ( !empty( $similarities ) ) {
Modified: trunk/extensions/FileSearch/FileSearchIndexer.php
===================================================================
--- trunk/extensions/FileSearch/FileSearchIndexer.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/FileSearch/FileSearchIndexer.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -29,7 +29,7 @@
$title = $file->getTitle();
$article = new Article( $title );
- $update = new SearchUpdate( $title->getArticleId(),
+ $update = new SearchUpdate( $title->getArticleID(),
$title->getPrefixedText(),
$article->getContent() );
array_push( $wgDeferredUpdateList, $update );
}
Modified: trunk/extensions/FlagPage/FlagPage.body.php
===================================================================
--- trunk/extensions/FlagPage/FlagPage.body.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/FlagPage/FlagPage.body.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -123,7 +123,7 @@
$this->preview( $page, $template );
return;
}
- $id = Title::newFromText( $page )->getArticleId();
+ $id = Title::newFromText( $page )->getArticleID();
if ($id==0) { # Page does not exist. Show preview page
$wgOut->wrapWikiMsg( "<div class='error
plainlinks'>\n$1</div>\n", array( 'flagpage-nonexistent', $page ) );
$this->preview( $page, $template );
Modified: trunk/extensions/FlaggedRevs/backend/FRDependencyUpdate.php
===================================================================
--- trunk/extensions/FlaggedRevs/backend/FRDependencyUpdate.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/FlaggedRevs/backend/FRDependencyUpdate.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -83,7 +83,7 @@
wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
$res = $db->select( 'flaggedrevs_tracking',
array( 'ftr_namespace', 'ftr_title' ),
- array( 'ftr_from' => $this->title->getArticleId() ),
+ array( 'ftr_from' => $this->title->getArticleID() ),
__METHOD__
);
$arr = array();
@@ -110,7 +110,7 @@
}
foreach ( $diffs as $dbk => $id ) {
$arr[] = array(
- 'ftr_from' =>
$this->title->getArticleId(),
+ 'ftr_from' =>
$this->title->getArticleID(),
'ftr_namespace' => $ns,
'ftr_title' => $dbk
);
@@ -135,7 +135,7 @@
if ( $del ) {
$clause = self::makeWhereFrom2d( $del, wfGetDB(
DB_MASTER ) );
if ( $clause ) {
- return array( $clause, 'ftr_from' =>
$this->title->getArticleId() );
+ return array( $clause, 'ftr_from' =>
$this->title->getArticleID() );
}
}
return false;
@@ -163,7 +163,7 @@
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'pagelinks',
array( 'pl_namespace', 'pl_title' ),
- array( 'pl_from' => $this->title->getArticleId() ),
+ array( 'pl_from' => $this->title->getArticleID() ),
__METHOD__
);
$arr = array();
@@ -184,7 +184,7 @@
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'templatelinks',
array( 'tl_namespace', 'tl_title' ),
- array( 'tl_from' => $this->title->getArticleId() ),
+ array( 'tl_from' => $this->title->getArticleID() ),
__METHOD__
);
$arr = array();
@@ -205,7 +205,7 @@
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'imagelinks',
array( 'il_to' ),
- array( 'il_from' => $this->title->getArticleId() ),
+ array( 'il_from' => $this->title->getArticleID() ),
__METHOD__
);
$arr = array();
@@ -223,7 +223,7 @@
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'categorylinks',
array( 'cl_to', 'cl_sortkey' ),
- array( 'cl_from' => $this->title->getArticleId() ),
+ array( 'cl_from' => $this->title->getArticleID() ),
__METHOD__
);
$arr = array();
Modified: trunk/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -191,7 +191,7 @@
# Normalize NS_MEDIA to NS_FILE
if ( $title->getNamespace() == NS_MEDIA ) {
$title = Title::makeTitle( NS_FILE, $title->getDBkey()
);
- $title->resetArticleId( $title->getArticleId() ); //
avoid extra queries
+ $title->resetArticleId( $title->getArticleID() ); //
avoid extra queries
}
$time = $sha1 = false; // unspecified (defaults to current
version)
# Check for the version of this file used when reviewed...
Modified: trunk/extensions/FlaggedRevs/business/PageStabilityForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/business/PageStabilityForm.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/FlaggedRevs/business/PageStabilityForm.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -137,7 +137,7 @@
*/
protected function doCheckTarget( $flags = 0 ) {
$flgs = ( $flags & self::FOR_SUBMISSION ) ?
Title::GAID_FOR_UPDATE : 0;
- if ( !$this->page->getArticleId( $flgs ) ) {
+ if ( !$this->page->getArticleID( $flgs ) ) {
return 'stabilize_page_notexists';
} elseif ( !FlaggedRevs::inReviewNamespace( $this->page ) ) {
return 'stabilize_page_unreviewable';
Modified: trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
2012-03-11 18:59:28 UTC (rev 113582)
+++ trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
2012-03-11 19:04:37 UTC (rev 113583)
@@ -162,7 +162,7 @@
*/
protected function doCheckTarget( $flags = 0 ) {
$flgs = ( $flags & self::FOR_SUBMISSION ) ?
Title::GAID_FOR_UPDATE : 0;
- if ( !$this->page->getArticleId( $flgs ) ) {
+ if ( !$this->page->getArticleID( $flgs ) ) {
return 'review_page_notexists';
}
$flgs = ( $flags & self::FOR_SUBMISSION ) ? FR_MASTER : 0;
Modified: trunk/extensions/GlobalUsage/GlobalUsageHooks.php
===================================================================
--- trunk/extensions/GlobalUsage/GlobalUsageHooks.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/GlobalUsage/GlobalUsageHooks.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -36,11 +36,11 @@
$gu = self::getGlobalUsage();
if ( $wgUseDumbLinkUpdate ) {
// Delete all entries to the page
- $gu->deleteLinksFromPage( $title->getArticleId(
Title::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(
Title::GAID_FOR_UPDATE );
+ $articleId = $title->getArticleID(
Title::GAID_FOR_UPDATE );
$existing = $gu->getLinksFromPage( $articleId );
// Calculate changes
Modified: trunk/extensions/JSKit/JSKit.php
===================================================================
--- trunk/extensions/JSKit/JSKit.php 2012-03-11 18:59:28 UTC (rev 113582)
+++ trunk/extensions/JSKit/JSKit.php 2012-03-11 19:04:37 UTC (rev 113583)
@@ -166,7 +166,7 @@
function efJSKit( $out, &$text ) {
global $wgJSKitNamespaces, $wgJSKitAlways;
$ns = $out->getTitle()->getNamespace();
- if( !$out->getTitle()->getArticleId() ) {
+ if( !$out->getTitle()->getArticleID() ) {
// special page or wrong namespace, so don't do anything
return true;
}
Modified: trunk/extensions/LiquidThreads/classes/Dispatch.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/Dispatch.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/LiquidThreads/classes/Dispatch.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -131,7 +131,7 @@
return null;
}
- $articleid = $title->getArticleId();
+ $articleid = $title->getArticleID();
global $wgLiquidThreadsAllowUserControlNamespaces;
global $wgLiquidThreadsAllowUserControl;
Modified: trunk/extensions/LiquidThreads/classes/Hooks.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/Hooks.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/LiquidThreads/classes/Hooks.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -732,7 +732,7 @@
* @param $title Title
*/
public static function applyPendingArticleRelationship(
$pendingRelationship, $title ) {
- $articleID = $title->getArticleId();
+ $articleID = $title->getArticleID();
$dbw = wfGetDB( DB_MASTER );
Modified: trunk/extensions/LiquidThreads/classes/Thread.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/Thread.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/LiquidThreads/classes/Thread.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -668,15 +668,15 @@
foreach( $res as $row ) {
$t = Title::newFromRow( $row );
- if ( isset(
$restrictionRows[$t->getArticleId()] ) ) {
- $t->loadRestrictionsFromRows(
$restrictionRows[$t->getArticleId()],
+ if ( isset(
$restrictionRows[$t->getArticleID()] ) ) {
+ $t->loadRestrictionsFromRows(
$restrictionRows[$t->getArticleID()],
$row->page_restrictions );
}
$article = new Article( $t );
$article->loadPageData( $row );
- self::$titleCacheById[$t->getArticleId()] = $t;
+ self::$titleCacheById[$t->getArticleID()] = $t;
$articlesById[$article->getId()] = $article;
if ( count( self::$titleCacheById ) > 10000 ) {
@@ -858,7 +858,7 @@
$this->articleNamespace = $newTitle->getNamespace();
$this->articleTitle = $newTitle->getDbKey();
- $this->articleId = $newTitle->getArticleId();
+ $this->articleId = $newTitle->getArticleID();
$this->article = $newArticle;
}
@@ -872,7 +872,7 @@
$this->articleNamespace = $title->getNamespace();
$this->articleTitle = $title->getDbKey();
- $this->articleId = $title->getArticleId();
+ $this->articleId = $title->getArticleID();
$this->article = $ancestor->article();
}
@@ -890,9 +890,9 @@
// If still unfilled, the article ID referred to is no longer
valid. Re-fill it
// from the namespace/title pair if an article ID is provided
- if ( !$articleTitle && ( $this->articleId != 0 ||
$dbTitle->getArticleId() != 0 ) ) {
+ if ( !$articleTitle && ( $this->articleId != 0 ||
$dbTitle->getArticleID() != 0 ) ) {
$articleTitle = $dbTitle;
- $this->articleId = $articleTitle->getArticleId();
+ $this->articleId = $articleTitle->getArticleID();
$this->article = new Article( $dbTitle );
$set['thread_article_id'] = $this->articleId;
Modified: trunk/extensions/MeanEditor/MeanEditorEditPage.body.php
===================================================================
--- trunk/extensions/MeanEditor/MeanEditorEditPage.body.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/MeanEditor/MeanEditorEditPage.body.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -160,7 +160,7 @@
wfProfileOut( __METHOD__ );
return;
}
- if ( !$this->mTitle->getArticleId() )
+ if ( !$this->mTitle->getArticleID() )
wfRunHooks( 'EditFormPreloadText', array(
&$this->textbox1, &$this->mTitle ) );
else
wfRunHooks( 'EditFormInitialText', array( $this
) );
Modified:
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
===================================================================
---
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
2012-03-11 18:59:28 UTC (rev 113582)
+++
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
2012-03-11 19:04:37 UTC (rev 113583)
@@ -248,7 +248,7 @@
wfProfileOut( $fname );
return;
}
- if ( !$this->mTitle->getArticleId() )
+ if ( !$this->mTitle->getArticleID() )
wfRunHooks( 'EditFormPreloadText', array(
&$this->textbox1, &$this->mTitle ) );
}
Modified: trunk/extensions/OAI/OAIHarvest.php
===================================================================
--- trunk/extensions/OAI/OAIHarvest.php 2012-03-11 18:59:28 UTC (rev 113582)
+++ trunk/extensions/OAI/OAIHarvest.php 2012-03-11 19:04:37 UTC (rev 113583)
@@ -274,7 +274,7 @@
/**
* @return int
*/
- function getArticleId() {
+ function getArticleID() {
return IntVal( $this->_page['id'] );
}
@@ -305,17 +305,17 @@
function dump() {
if( $this->isDeleted() ) {
- printf( "%14s %10d\n", '(deleted page)',
$this->getArticleId() );
+ printf( "%14s %10d\n", '(deleted page)',
$this->getArticleID() );
} else {
$title = $this->getTitle();
if( $title ) {
printf( "%s %10d [[%s]]\n",
$this->getTimestamp(
$this->_page['revisions'][0]['timestamp'] ),
- $this->getArticleId(),
+ $this->getArticleID(),
$title->getPrefixedText() );
} else {
printf( "*** INVALID TITLE on %d: \"%s\"\n",
- $this->getArticleId(),
+ $this->getArticleID(),
$this->_page['title'] );
}
}
@@ -363,7 +363,7 @@
if( is_null( $title ) ) {
throw new OAIError( sprintf(
"Bad title for update to page #%d; cannot apply
update: \"%s\"",
- $this->getArticleId(),
+ $this->getArticleID(),
$this->_page['title'] ) );
}
@@ -387,7 +387,7 @@
*/
function applyRevision( $data ) {
$title = $this->getTitle();
- $pageId = $this->getArticleId();
+ $pageId = $this->getArticleID();
$timestamp = $this->getTimestamp( $data['timestamp'] );
$dbw = wfGetDB( DB_WRITE );
@@ -596,7 +596,7 @@
$dbw = wfGetDB( DB_MASTER );
$dbw->begin();
- $title = Title::newFromId( $this->getArticleId() );
+ $title = Title::newFromId( $this->getArticleID() );
if( $title ) {
$article = new Article( $title );
Modified: trunk/extensions/OpenStackManager/OpenStackNovaProject.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaProject.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/OpenStackManager/OpenStackNovaProject.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -346,7 +346,7 @@
OpenStackNovaArticle::editArticle( $this->getProjectName(),
$text );
if ( $wgOpenStackManagerCreateProjectSALPages ) {
$pagename = $this->getProjectName() . "/SAL";
- $id = Title::newFromText( $pagename, NS_NOVA_RESOURCE
)->getArticleId();
+ $id = Title::newFromText( $pagename, NS_NOVA_RESOURCE
)->getArticleID();
$article = Article::newFromId( $id );
$content = '';
if ( $article ) {
Modified: trunk/extensions/PageInCat/PageInCat_body.php
===================================================================
--- trunk/extensions/PageInCat/PageInCat_body.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/PageInCat/PageInCat_body.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -67,7 +67,7 @@
}
}
- $pageId = $page->getArticleId();
+ $pageId = $page->getArticleID();
if ( !$pageId ) {
// page hasn't yet been saved (preview)
// add to the cache list so the other hook
Modified: trunk/extensions/Patroller/Patroller.class.php
===================================================================
--- trunk/extensions/Patroller/Patroller.class.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/Patroller/Patroller.class.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -246,7 +246,7 @@
$old = Revision::newFromId(
$edit->mAttribs['rc_last_oldid'] );
# Be certain we're not overwriting a more recent change
# If we would, ignore it, and silently consider this
change patrolled
- $latest = (int)$dbw->selectField( 'page',
'page_latest', array( 'page_id' => $title->getArticleId() ), __METHOD__ );
+ $latest = (int)$dbw->selectField( 'page',
'page_latest', array( 'page_id' => $title->getArticleID() ), __METHOD__ );
if( $edit->mAttribs['rc_this_oldid'] == $latest ) {
# Revert the edit; keep the reversion itself
out of recent changes
wfDebugLog( 'patroller', 'Reverting "' .
$title->getPrefixedText() . '" to r' . $old->getId() );
Modified: trunk/extensions/Ratings/Ratings.class.php
===================================================================
--- trunk/extensions/Ratings/Ratings.class.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/Ratings/Ratings.class.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -121,7 +121,7 @@
'vote_value'
),
array(
- 'vote_page_id' => $page->getArticleId()
+ 'vote_page_id' => $page->getArticleID()
)
);
Modified: trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
===================================================================
--- trunk/extensions/ReaderFeedback/ReaderFeedback.class.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/ReaderFeedback/ReaderFeedback.class.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -136,7 +136,7 @@
global $wgLang, $wgMemc;
$votes = null;
$now = time();
- $key = wfMemcKey( 'feedback', 'ratingtally',
$page->getArticleId(), $period );
+ $key = wfMemcKey( 'feedback', 'ratingtally',
$page->getArticleID(), $period );
// Check cache
if( $cache == 'useCache' ) {
$set = $wgMemc->get($key);
@@ -162,14 +162,14 @@
// Get the first revision possibly voted on in the range
$firstRevTS = $dbr->selectField( 'revision',
'rev_timestamp',
- array( 'rev_page' => $page->getArticleId(),
"rev_timestamp <= $cutoff" ),
+ array( 'rev_page' => $page->getArticleID(),
"rev_timestamp <= $cutoff" ),
__METHOD__,
array( 'ORDER BY' => 'rev_timestamp DESC' )
);
// Find average, median...
$res = $dbr->select( array( 'revision',
'reader_feedback' ),
array( 'rfb_ratings' ),
- array( 'rev_page' => $page->getArticleId(),
+ array( 'rev_page' => $page->getArticleID(),
"rev_id = rfb_rev_id",
"rfb_timestamp >= $cutoff",
// Trigger INDEX usage
Modified: trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
===================================================================
--- trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
2012-03-11 18:59:28 UTC (rev 113582)
+++ trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php
2012-03-11 19:04:37 UTC (rev 113583)
@@ -326,7 +326,7 @@
// Re-scale voter count to fit to graph
$this->dScale = ceil($maxC/5);
// Cache the scale value to memory
- $key = wfMemcKey( 'feedback', 'scale',
$this->page->getArticleId(), $this->period );
+ $key = wfMemcKey( 'feedback', 'scale',
$this->page->getArticleID(), $this->period );
$wgMemc->set( $key, $this->dScale, 7*24*3600 );
// Fit to [0,4]
foreach( $data as $x => $dataRow ) {
@@ -444,7 +444,7 @@
// Re-scale voter count to fit to graph
$this->dScale = ceil($maxC/5);
// Cache the scale value to memory
- $key = wfMemcKey( 'feedback', 'scale',
$this->page->getArticleId(), $this->period );
+ $key = wfMemcKey( 'feedback', 'scale',
$this->page->getArticleID(), $this->period );
$wgMemc->set( $key, $this->dScale, 7*24*3600 );
// Fit to [0,4]
foreach( $dcount as $x => $c ) {
@@ -517,7 +517,7 @@
$cutoff = $dbr->addQuotes( wfTimestamp( TS_MW, $cutoff_unixtime
) );
$res = $dbr->select( 'reader_feedback_history',
array( 'rfh_total', 'rfh_count', 'rfh_date' ),
- array( 'rfh_page_id' => $this->page->getArticleId(),
+ array( 'rfh_page_id' => $this->page->getArticleID(),
'rfh_tag' => $tag,
"rfh_date >= {$cutoff}"),
__METHOD__,
@@ -570,7 +570,7 @@
public function getRelPath( $tag, $ext = '' ) {
$ext = $ext ? $ext : self::getCachedFileExtension();
- $pageId = $this->page->getArticleId();
+ $pageId = $this->page->getArticleID();
# Paranoid check. Should not be necessary, but here to be
safe...
if( !preg_match('/^[a-zA-Z]{1,20}$/',$tag) ) {
throw new MWException( 'Invalid tag name!' );
@@ -605,7 +605,7 @@
if( $this->period > 93 ) {
return ''; // too big
}
- $key = wfMemcKey( 'feedback', 'ratingusers',
$this->page->getArticleId(), $this->period );
+ $key = wfMemcKey( 'feedback', 'ratingusers',
$this->page->getArticleID(), $this->period );
// Check cache
if( !$this->doPurge ) {
$set = $wgMemc->get($key);
@@ -629,7 +629,7 @@
// Get the first revision possibly voted on in the range
$firstRevTS = $dbr->selectField( 'revision',
'rev_timestamp',
- array( 'rev_page' => $this->page->getArticleId(),
"rev_timestamp <= $cutoff" ),
+ array( 'rev_page' => $this->page->getArticleID(),
"rev_timestamp <= $cutoff" ),
__METHOD__,
array( 'ORDER BY' => 'rev_timestamp DESC' )
);
@@ -637,7 +637,7 @@
$res = $dbr->select( array( 'revision', 'reader_feedback',
'user' ),
# COALESCE() gets the user_name for users, and the IP
for anons
array( 'rfb_user', 'COALESCE(user_name,rfb_ip) AS
name', 'COUNT(rfb_rev_id) AS n' ),
- array( 'rev_page' => $this->page->getArticleId(),
+ array( 'rev_page' => $this->page->getArticleID(),
"rev_id = rfb_rev_id",
"rfb_timestamp >= $cutoff",
// Trigger INDEX usage
@@ -670,7 +670,7 @@
public function purgePage() {
global $wgUploadDirectory;
foreach( ReaderFeedback::getFeedbackTags() as $tag => $weight )
{
- $dir =
"{$wgUploadDirectory}/graphs/".$this->page->getArticleId()."/{$tag}/";
+ $dir =
"{$wgUploadDirectory}/graphs/".$this->page->getArticleID()."/{$tag}/";
if( is_dir( $dir ) ) {
$handle = opendir( $dir );
if( $handle ) {
@@ -696,7 +696,7 @@
if( $this->doPurge || !file_exists($path) ) {
return true;
}
- $key = wfMemcKey( 'feedback', 'scale',
$this->page->getArticleId(), $this->period );
+ $key = wfMemcKey( 'feedback', 'scale',
$this->page->getArticleID(), $this->period );
// Get scale cache value...
$this->dScale = $wgMemc->get( $key );
if( $this->dScale == false ) {
@@ -704,7 +704,7 @@
}
$dbr = wfGetDB( DB_SLAVE );
$tagTimestamp = $dbr->selectField( 'reader_feedback_pages',
'rfp_touched',
- array( 'rfp_page_id' => $this->page->getArticleId(),
'rfp_tag' => $tag ),
+ array( 'rfp_page_id' => $this->page->getArticleID(),
'rfp_tag' => $tag ),
__METHOD__ );
$tagTimestamp = wfTimestamp( TS_UNIX, $tagTimestamp );
$file_unixtime = filemtime($path);
@@ -727,7 +727,7 @@
$dbr = wfGetDB( DB_SLAVE );
$tagTimestamp = $dbr->selectField( 'reader_feedback_pages',
'MAX(rfp_touched)',
- array( 'rfp_page_id' => $page->getArticleId() ),
+ array( 'rfp_page_id' => $page->getArticleID() ),
__METHOD__ );
return wfTimestamp( TS_MW, $tagTimestamp );
}
Modified: trunk/extensions/SemanticForms/includes/SF_Utils.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_Utils.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/SemanticForms/includes/SF_Utils.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -106,7 +106,7 @@
$db = wfGetDB( DB_SLAVE );
$conditions = null;
if ( !is_null( $title ) ) {
- $titlekey = $title->getArticleId();
+ $titlekey = $title->getArticleID();
if ( $titlekey == 0 ) {
// Something's wrong - exit
return $categories;
Modified: trunk/extensions/SemanticPageSeries/includes/SPSUtils.php
===================================================================
--- trunk/extensions/SemanticPageSeries/includes/SPSUtils.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/SemanticPageSeries/includes/SPSUtils.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -60,7 +60,7 @@
// set the origin parameter
// This will block it from use as iterator parameter. Oh well.
- $params[] = "origin=" . $parser->getTitle()->getArticleId();
+ $params[] = "origin=" . $parser->getTitle()->getArticleID();
// hack to remove newline from beginning of output, thanks to
//
http://jimbojw.com/wiki/index.php?title=Raw_HTML_Output_from_a_MediaWiki_Parser_Function
Modified: trunk/extensions/SpamBlacklist/SpamBlacklist_body.php
===================================================================
--- trunk/extensions/SpamBlacklist/SpamBlacklist_body.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/SpamBlacklist/SpamBlacklist_body.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -119,7 +119,7 @@
*/
function getCurrentLinks( $title ) {
$dbr = wfGetDB( DB_SLAVE );
- $id = $title->getArticleId(); // should be zero queries
+ $id = $title->getArticleID(); // should be zero queries
$res = $dbr->select( 'externallinks', array( 'el_to' ),
array( 'el_from' => $id ), __METHOD__ );
$links = array();
Modified: trunk/extensions/Translate/MessageGroups.php
===================================================================
--- trunk/extensions/Translate/MessageGroups.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/Translate/MessageGroups.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -817,7 +817,7 @@
$dbr = wfGetDB( DB_SLAVE );
$tables = 'translate_sections';
$vars = array( 'trs_key', 'trs_text' );
- $conds = array( 'trs_page' => $this->getTitle()->getArticleId()
);
+ $conds = array( 'trs_page' => $this->getTitle()->getArticleID()
);
$options = array( 'ORDER BY' => 'trs_order' );
$res = $dbr->select( $tables, $vars, $conds, __METHOD__,
$options );
Modified: trunk/extensions/Translate/TranslateEditAddons.php
===================================================================
--- trunk/extensions/Translate/TranslateEditAddons.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/Translate/TranslateEditAddons.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -400,7 +400,7 @@
$dbw = wfGetDB( DB_MASTER );
$conds = array(
- 'rt_page' => $title->getArticleId(),
+ 'rt_page' => $title->getArticleID(),
'rt_type' => RevTag::getType( 'fuzzy' ),
'rt_revision' => $revision
);
@@ -449,7 +449,7 @@
$dbw = wfGetDB( DB_MASTER );
$conds = array(
- 'rt_page' => $title->getArticleId(),
+ 'rt_page' => $title->getArticleID(),
'rt_type' => RevTag::getType( 'tp:transver' ),
'rt_revision' => $revision,
'rt_value' => $definitionRevision,
Modified: trunk/extensions/Translate/tag/PageTranslationHooks.php
===================================================================
--- trunk/extensions/Translate/tag/PageTranslationHooks.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/Translate/tag/PageTranslationHooks.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -129,7 +129,7 @@
$dbw = wfGetDB( DB_MASTER );
$conds = array(
- 'rt_page' => $title->getArticleId(),
+ 'rt_page' => $title->getArticleID(),
'rt_type' => RevTag::getType( 'tp:transver' ),
'rt_revision' => $revision
);
Modified: trunk/extensions/Translate/tag/SpecialPageTranslation.php
===================================================================
--- trunk/extensions/Translate/tag/SpecialPageTranslation.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/Translate/tag/SpecialPageTranslation.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -637,7 +637,7 @@
$inserts = array();
$changed = array();
- $pageId = $page->getTitle()->getArticleId();
+ $pageId = $page->getTitle()->getArticleID();
foreach ( array_values( $sections ) as $index => $s ) {
if ( $s->type === 'changed' ) {
// Allow silent changes to avoid fuzzying
unnecessary.
@@ -667,7 +667,7 @@
unset( $inserts[$index]['trs_order'] );
}
}
- $dbw->delete( 'translate_sections', array( 'trs_page' =>
$page->getTitle()->getArticleId() ), __METHOD__ );
+ $dbw->delete( 'translate_sections', array( 'trs_page' =>
$page->getTitle()->getArticleID() ), __METHOD__ );
$dbw->insert( 'translate_sections', $inserts, __METHOD__ );
/* Stores the names of changed sections in the database.
Modified: trunk/extensions/Translate/tag/TranslatablePage.php
===================================================================
--- trunk/extensions/Translate/tag/TranslatablePage.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/Translate/tag/TranslatablePage.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -460,7 +460,7 @@
protected function addTag( $tag, $revision, $value = null ) {
$dbw = wfGetDB( DB_MASTER );
- $aid = $this->getTitle()->getArticleId();
+ $aid = $this->getTitle()->getArticleID();
if ( is_object( $revision ) ) {
throw new MWException( 'Got object, excepted id' );
@@ -506,7 +506,7 @@
* @todo Change name to something better.
*/
public function removeTags() {
- $aid = $this->getTitle()->getArticleId();
+ $aid = $this->getTitle()->getArticleID();
$dbw = wfGetDB( DB_MASTER );
$conds = array(
@@ -532,7 +532,7 @@
return false;
}
- $aid = $this->getTitle()->getArticleId();
+ $aid = $this->getTitle()->getArticleID();
if ( isset( self::$tagCache[$aid][$tag] ) ) {
return self::$tagCache[$aid][$tag];
@@ -576,7 +576,7 @@
$fields = array( 'rt_revision', 'rt_value' );
$conds = array(
- 'rt_page' => $this->getTitle()->getArticleId(),
+ 'rt_page' => $this->getTitle()->getArticleID(),
'rt_type' => RevTag::getType( 'tp:mark' ),
);
$options = array( 'ORDER BY' => 'rt_revision DESC' );
@@ -714,7 +714,7 @@
$db = wfGetDB( DB_SLAVE );
$fields = 'rt_value';
$conds = array(
- 'rt_page' => $title->getArticleId(),
+ 'rt_page' => $title->getArticleID(),
'rt_type' => RevTag::getType( 'tp:transver' ),
);
$options = array( 'ORDER BY' => 'rt_revision DESC' );
@@ -778,7 +778,7 @@
$cacheObj->set( $cacheKey, $cache, 60 * 5 );
}
- return in_array( $title->getArticleId(), $cache );
+ return in_array( $title->getArticleID(), $cache );
}
/// List of page ids where the latest revision is either tagged or
marked
Modified: trunk/extensions/Translate/utils/TranslationHelpers.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationHelpers.php 2012-03-11
18:59:28 UTC (rev 113582)
+++ trunk/extensions/Translate/utils/TranslationHelpers.php 2012-03-11
19:04:37 UTC (rev 113583)
@@ -900,7 +900,7 @@
$db = wfGetDB( DB_MASTER );
$conds = array(
- 'rt_page' => $title->getArticleId(),
+ 'rt_page' => $title->getArticleID(),
'rt_type' => RevTag::getType( 'tp:transver' ),
);
$options = array(
Modified: trunk/extensions/WikiSync/WikiSyncExporter.php
===================================================================
--- trunk/extensions/WikiSync/WikiSyncExporter.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/WikiSync/WikiSyncExporter.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -87,7 +87,7 @@
// because they are placed on top of real user made revisions,
// making the binary search algorithm used to compare local and
remote revs to fail
// TODO: change the binary search algorithm to two/three level
hashes
- if ( WikiSyncSetup::$report_null_revisions &&
$title->getArticleId() !== 0 ) {
+ if ( WikiSyncSetup::$report_null_revisions &&
$title->getArticleID() !== 0 ) {
parent::reportPage( $title, $origTitle, $revisionCount,
$successCount, $pageInfo );
}
}
Modified: trunk/extensions/Wikilog/WikilogFeed.php
===================================================================
--- trunk/extensions/Wikilog/WikilogFeed.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/Wikilog/WikilogFeed.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -473,7 +473,7 @@
'wlw_icon', 'wlw_logo', 'wlw_authors',
'wlw_updated'
),
- array( 'wlw_page' =>
$wikilogTitle->getArticleId() ),
+ array( 'wlw_page' =>
$wikilogTitle->getArticleID() ),
__METHOD__
);
if ( $row !== false ) {
@@ -615,7 +615,7 @@
*/
public function getCacheKeys() {
if ( ( $title = $this->mQuery->getWikilogTitle() ) ) {
- $id = 'id:' . $title->getArticleId();
+ $id = 'id:' . $title->getArticleID();
} elseif ( ( $ns = $this->mQuery->getNamespace() ) ) {
$id = 'ns:' . $ns;
} else {
@@ -637,7 +637,7 @@
public static function makeEntryId( $title ) {
global $wgTaggingEntity;
if ( $wgTaggingEntity ) {
- $qstr = wfArrayToCGI( array( 'wk' => wfWikiID(), 'id'
=> $title->getArticleId() ) );
+ $qstr = wfArrayToCGI( array( 'wk' => wfWikiID(), 'id'
=> $title->getArticleID() ) );
return
"tag:{$wgTaggingEntity}:/MediaWiki/Wikilog?{$qstr}";
} else {
return $title->getFullUrl();
@@ -837,7 +837,7 @@
} else {
$title = null;
}
- $id = $title ? 'id:' . $title->getArticleId() : 'site';
+ $id = $title ? 'id:' . $title->getArticleID() : 'site';
$ft = 'show:' . $this->mQuery->getModStatus() .
':limit:' . $this->mLimit;
return array(
Modified: trunk/extensions/Wikilog/WikilogHooks.php
===================================================================
--- trunk/extensions/Wikilog/WikilogHooks.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/Wikilog/WikilogHooks.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -73,7 +73,7 @@
$item->mTitle = $wi->getItemTitle();
$item->mParentName = $wi->getName();
$item->mParentTitle = $wi->getTitle();
- $item->mParent = $item->mParentTitle->getArticleId();
+ $item->mParent = $item->mParentTitle->getArticleID();
# Override item name if {{DISPLAYTITLE:...}} was used.
$dtText = $editInfo->output->getDisplayTitle();
@@ -233,7 +233,7 @@
$item->mTitle = $wi->getItemTitle();
$item->mParentName = $wi->getName();
$item->mParentTitle = $wi->getTitle();
- $item->mParent =
$item->mParentTitle->getArticleId();
+ $item->mParent =
$item->mParentTitle->getArticleID();
$item->saveData();
}
} elseif ( $newwl ) {
Modified: trunk/extensions/Wikilog/WikilogMainPage.php
===================================================================
--- trunk/extensions/Wikilog/WikilogMainPage.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/Wikilog/WikilogMainPage.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -196,7 +196,7 @@
'COUNT(*) as total, SUM(wlp_publish) as published',
array(
'wlp_page = page_id',
- 'wlp_parent' => $this->mTitle->getArticleId(),
+ 'wlp_parent' => $this->mTitle->getArticleID(),
'page_is_redirect' => 0
),
__METHOD__
Modified: trunk/extensions/Wikilog/WikilogQuery.php
===================================================================
--- trunk/extensions/Wikilog/WikilogQuery.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/Wikilog/WikilogQuery.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -331,7 +331,7 @@
# Filter by wikilog name.
if ( $this->mWikilogTitle !== null ) {
- $q_conds['wlp_parent'] =
$this->mWikilogTitle->getArticleId();
+ $q_conds['wlp_parent'] =
$this->mWikilogTitle->getArticleID();
} elseif ( $this->mNamespace !== false ) {
$q_conds['p.page_namespace'] = $this->mNamespace;
}
@@ -566,7 +566,7 @@
*/
public function setItem( $item ) {
if ( $item instanceof Title ) {
- $item = WikilogItem::newFromID( $item->getArticleId() );
+ $item = WikilogItem::newFromID( $item->getArticleID() );
}
$this->mItem = $item;
}
@@ -678,7 +678,7 @@
}
} elseif ( $this->mWikilog !== null ) {
$join_wlp = true;
- $q_conds['wlp_parent'] =
$this->mWikilog->getArticleId();
+ $q_conds['wlp_parent'] =
$this->mWikilog->getArticleID();
} elseif ( $this->mNamespace !== false ) {
$q_conds['c.page_namespace'] = $this->mNamespace;
}
Modified: trunk/extensions/Wikilog/WikilogUtils.php
===================================================================
--- trunk/extensions/Wikilog/WikilogUtils.php 2012-03-11 18:59:28 UTC (rev
113582)
+++ trunk/extensions/Wikilog/WikilogUtils.php 2012-03-11 19:04:37 UTC (rev
113583)
@@ -317,7 +317,7 @@
$dbw->update(
'wikilog_wikilogs',
array( 'wlw_updated' => $dbw->timestamp() ),
- array( 'wlw_page' => $title->getArticleId(), ),
+ array( 'wlw_page' => $title->getArticleID(), ),
__METHOD__
);
}
Modified: trunk/extensions/skins/Nimbus/Nimbus.skin.php
===================================================================
--- trunk/extensions/skins/Nimbus/Nimbus.skin.php 2012-03-11 18:59:28 UTC
(rev 113582)
+++ trunk/extensions/skins/Nimbus/Nimbus.skin.php 2012-03-11 19:04:37 UTC
(rev 113583)
@@ -453,7 +453,7 @@
if( $selected ) {
$classes[] = 'selected';
}
- if( $checkEdit && $title->getArticleId() == 0 ) {
+ if( $checkEdit && $title->getArticleID() == 0 ) {
$query = 'action=edit';
$classes[] = ' new';
}
@@ -527,7 +527,7 @@
);
}
- if ( $wgTitle->getArticleId() ) {
+ if ( $wgTitle->getArticleID() ) {
$content_actions['history'] = array(
'class' => ( $action == 'history' ) ?
'selected' : false,
'text' => wfMsg( 'history_short' ),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
