From c0151eec5f1e27a873a46551c887484df80057cb Mon Sep 17 00:00:00 2001 From: umherirrender Date: Tue, 2 Dec 2014 19:13:06 +0100 Subject: [PATCH] Fix case of various newFromID/newFromId functions User::newFromID -> User::newFromId Revision::newFromID -> Revision::newFromId RecentChange::newFromID -> RecentChange::newFromId WikiPage::newFromId -> WikiPage::newFromID Title::newFromId -> Title::newFromID Change-Id: I310f26653613951e9b21ce915a92d205a87937f1 --- includes/Block.php | 4 ++-- includes/api/ApiEditPage.php | 4 ++-- includes/api/ApiParse.php | 2 +- includes/api/ApiPatrol.php | 2 +- includes/api/ApiQueryRevisionsBase.php | 2 +- includes/changes/RecentChange.php | 2 +- includes/deferred/SearchUpdate.php | 2 +- maintenance/storage/recompressTracked.php | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/includes/Block.php b/includes/Block.php index 3c80035231..f2ab6d5479 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -113,7 +113,7 @@ class Block { $this->forcedTargetID = $user; // needed for foreign users } if ( $by ) { // local user - $this->setBlocker( User::newFromID( $by ) ); + $this->setBlocker( User::newFromId( $by ) ); } else { // foreign user $this->setBlocker( $byText ); } @@ -366,7 +366,7 @@ class Block { protected function initFromRow( $row ) { $this->setTarget( $row->ipb_address ); if ( $row->ipb_by ) { // local user - $this->setBlocker( User::newFromID( $row->ipb_by ) ); + $this->setBlocker( User::newFromId( $row->ipb_by ) ); } else { // foreign user $this->setBlocker( $row->ipb_by_text ); } diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index 80589c34a9..a396ffec6a 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -195,9 +195,9 @@ class ApiEditPage extends ApiBase { list( $params['undo'], $params['undoafter'] ) = array( $params['undoafter'], $params['undo'] ); } - $undoafterRev = Revision::newFromID( $params['undoafter'] ); + $undoafterRev = Revision::newFromId( $params['undoafter'] ); } - $undoRev = Revision::newFromID( $params['undo'] ); + $undoRev = Revision::newFromId( $params['undo'] ); if ( is_null( $undoRev ) || $undoRev->isDeleted( Revision::DELETED_TEXT ) ) { $this->dieUsageMsg( array( 'nosuchrevid', $params['undo'] ) ); } diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index 2bf16773ea..f2603853c2 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -87,7 +87,7 @@ class ApiParse extends ApiBase { if ( !is_null( $oldid ) || !is_null( $pageid ) || !is_null( $page ) ) { if ( !is_null( $oldid ) ) { // Don't use the parser cache - $rev = Revision::newFromID( $oldid ); + $rev = Revision::newFromId( $oldid ); if ( !$rev ) { $this->dieUsage( "There is no revision ID $oldid", 'missingrev' ); } diff --git a/includes/api/ApiPatrol.php b/includes/api/ApiPatrol.php index 3684461c1e..779c41884b 100644 --- a/includes/api/ApiPatrol.php +++ b/includes/api/ApiPatrol.php @@ -38,7 +38,7 @@ class ApiPatrol extends ApiBase { $this->requireOnlyOneParameter( $params, 'rcid', 'revid' ); if ( isset( $params['rcid'] ) ) { - $rc = RecentChange::newFromID( $params['rcid'] ); + $rc = RecentChange::newFromId( $params['rcid'] ); if ( !$rc ) { $this->dieUsageMsg( array( 'nosuchrcid', $params['rcid'] ) ); } diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php index 4d75a20b77..a658309f73 100644 --- a/includes/api/ApiQueryRevisionsBase.php +++ b/includes/api/ApiQueryRevisionsBase.php @@ -78,7 +78,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase { // DifferenceEngine returns a rather ambiguous empty // string if that's not the case if ( $params['diffto'] != 0 ) { - $difftoRev = Revision::newFromID( $params['diffto'] ); + $difftoRev = Revision::newFromId( $params['diffto'] ); if ( !$difftoRev ) { $this->dieUsageMsg( array( 'nosuchrevid', $params['diffto'] ) ); } diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index d187c54f14..bf0c644e5e 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -257,7 +257,7 @@ class RecentChange { public function getPerformer() { if ( $this->mPerformer === false ) { if ( $this->mAttribs['rc_user'] ) { - $this->mPerformer = User::newFromID( $this->mAttribs['rc_user'] ); + $this->mPerformer = User::newFromId( $this->mAttribs['rc_user'] ); } else { $this->mPerformer = User::newFromName( $this->mAttribs['rc_user_text'], false ); } diff --git a/includes/deferred/SearchUpdate.php b/includes/deferred/SearchUpdate.php index 5d084afddd..8808c201e3 100644 --- a/includes/deferred/SearchUpdate.php +++ b/includes/deferred/SearchUpdate.php @@ -80,7 +80,7 @@ class SearchUpdate implements DeferrableUpdate { wfProfileIn( __METHOD__ ); - $page = WikiPage::newFromId( $this->id, WikiPage::READ_LATEST ); + $page = WikiPage::newFromID( $this->id, WikiPage::READ_LATEST ); foreach ( SearchEngine::getSearchTypes() as $type ) { $search = SearchEngine::create( $type ); diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php index 910f56bd80..45cc3396f5 100644 --- a/maintenance/storage/recompressTracked.php +++ b/maintenance/storage/recompressTracked.php @@ -471,7 +471,7 @@ class RecompressTracked { * @param int $pageId */ function doPage( $pageId ) { - $title = Title::newFromId( $pageId ); + $title = Title::newFromID( $pageId ); if ( $title ) { $titleText = $title->getPrefixedText(); } else { -- 2.20.1