Normalise casing of getArticleID used in core

diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index f0d0faa..d28642a 100644 (file)
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -394,8 +394,8 @@ class ApiQueryInfo extends ApiQueryBase {
                }
 
                if ( $this->fld_displaytitle ) {
-                       if ( isset( $this->displaytitles[$title->getArticleId()] ) ) {
-                               $pageInfo['displaytitle'] = $this->displaytitles[$title->getArticleId()];
+                       if ( isset( $this->displaytitles[$title->getArticleID()] ) ) {
+                               $pageInfo['displaytitle'] = $this->displaytitles[$title->getArticleID()];
                        } else {
                                $pageInfo['displaytitle'] = $title->getPrefixedText();
                        }

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index f1a2974..ea8d7a3 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1094,7 +1094,7 @@ class LocalFile extends File {
                        $latest = $descTitle->getLatestRevID();
                        $nullRevision = Revision::newNullRevision(
                                $dbw,
-                               $descTitle->getArticleId(),
+                               $descTitle->getArticleID(),
                                $log->getRcComment(),
                                false
                        );

diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 5883216..5a01c52 100644 (file)
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -432,7 +432,7 @@ class ManualLogEntry extends LogEntryBase {
                        'log_user_text' => $this->getPerformer()->getName(),
                        'log_namespace' => $this->getTarget()->getNamespace(),
                        'log_title' => $this->getTarget()->getDBkey(),
-                       'log_page' => $this->getTarget()->getArticleId(),
+                       'log_page' => $this->getTarget()->getArticleID(),
                        'log_comment' => $comment,
                        'log_params' => serialize( (array) $this->getParameters() ),
                );
@@ -503,6 +503,9 @@ class ManualLogEntry extends LogEntryBase {
                return $this->performer;
        }
 
+       /**
+        * @return Title
+        */
        public function getTarget() {
                return $this->target;
        }

diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 51e2684..88f3484 100644 (file)
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -86,7 +86,7 @@ class LogPage {
                        'log_user_text' => $this->doer->getName(),
                        'log_namespace' => $this->target->getNamespace(),
                        'log_title' => $this->target->getDBkey(),
-                       'log_page' => $this->target->getArticleId(),
+                       'log_page' => $this->target->getArticleID(),
                        'log_comment' => $this->comment,
                        'log_params' => $this->params
                );

diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php
index 072aef1..9ca98e5 100644 (file)
--- a/includes/revisiondelete/RevisionDelete.php
+++ b/includes/revisiondelete/RevisionDelete.php
@@ -300,7 +300,7 @@ class RevDel_ArchiveItem extends RevDel_RevisionItem {
        public function __construct( $list, $row ) {
                RevDel_Item::__construct( $list, $row );
                $this->revision = Revision::newFromArchiveRow( $row,
-                       array( 'page' => $this->list->title->getArticleId() ) );
+                       array( 'page' => $this->list->title->getArticleID() ) );
        }
 
        public function getIdField() {
@@ -377,7 +377,7 @@ class RevDel_ArchivedRevisionItem extends RevDel_ArchiveItem {
                RevDel_Item::__construct( $list, $row );
 
                $this->revision = Revision::newFromArchiveRow( $row,
-                       array( 'page' => $this->list->title->getArticleId() ) );
+                       array( 'page' => $this->list->title->getArticleID() ) );
        }
 
        public function getIdField() {

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index dea2bac..ed93920 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -390,7 +390,7 @@ class ImportReporter extends ContextSource {
                        $comment = $detail; // quick
                        $dbw = wfGetDB( DB_MASTER );
                        $latest = $title->getLatestRevID();
-                       $nullRevision = Revision::newNullRevision( $dbw, $title->getArticleId(), $comment, true );
+                       $nullRevision = Revision::newNullRevision( $dbw, $title->getArticleID(), $comment, true );
                        if (!is_null($nullRevision)) {
                                $nullRevision->insertOn( $dbw );
                                $page = WikiPage::factory( $title );

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 19650da..fc75b2b 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -296,7 +296,7 @@ class SpecialMergeHistory extends SpecialPage {
                if( is_null( $targetTitle ) || is_null( $destTitle ) ) {
                        return false; // validate these
                }
-               if( $targetTitle->getArticleId() == $destTitle->getArticleId() ) {
+               if( $targetTitle->getArticleID() == $destTitle->getArticleID() ) {
                        return false;
                }
                # Verify that this timestamp is valid

diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index 1f556f8..238e181 100644 (file)
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -88,7 +88,7 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
                 */
 
                $dbr = wfGetDB( DB_SLAVE, 'recentchangeslinked' );
-               $id = $title->getArticleId();
+               $id = $title->getArticleID();
                $ns = $title->getNamespace();
                $dbkey = $title->getDBkey();
 

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 17d4c4b..f1750b4 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -195,7 +195,7 @@ class PageArchive {
                                        'ar_timestamp' => $dbr->timestamp( $timestamp ) ),
                        __METHOD__ );
                if( $row ) {
-                       return Revision::newFromArchiveRow( $row, array( 'page' => $this->title->getArticleId() ) );
+                       return Revision::newFromArchiveRow( $row, array( 'page' => $this->title->getArticleID() ) );
                } else {
                        return null;
                }
@@ -1160,7 +1160,7 @@ class SpecialUndelete extends SpecialPage {
 
        private function formatRevisionRow( $row, $earliestLiveTime, $remaining ) {
                $rev = Revision::newFromArchiveRow( $row,
-                       array( 'page' => $this->mTargetObj->getArticleId() ) );
+                       array( 'page' => $this->mTargetObj->getArticleID() ) );
                $stxt = '';
                $ts = wfTimestamp( TS_MW, $row->ar_timestamp );
                // Build checkboxen...

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 0a5fec3..74bd657 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -257,7 +257,7 @@ class NamespaceConflictChecker extends Maintenance {
                        $newTitle->getDBkey(),
                        $newTitle->getPrefixedText() ) );
 
-               $id = $newTitle->getArticleId();
+               $id = $newTitle->getArticleID();
                if ( $id ) {
                        $this->output( "...  *** cannot resolve automatically; page exists with ID $id ***\n" );
                        return false;
@@ -285,7 +285,7 @@ class NamespaceConflictChecker extends Maintenance {
                                        $this->output( "... !!! invalid title\n" );
                                        return false;
                                }
-                               $id = $title->getArticleId();
+                               $id = $title->getArticleID();
                                if ( $id ) {
                                        $this->output( "...  *** page exists with ID $id ***\n" );
                                } else {

diff --git a/skins/Standard.php b/skins/Standard.php
index bd0c41a..1114e7d 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -143,7 +143,7 @@ class StandardTemplate extends LegacyTemplate {
                }
 
                $s .= "\n<hr class='sep' />";
-               $articleExists = $title->getArticleId();
+               $articleExists = $title->getArticleID();
                if ( $this->data['isarticle'] || $action == 'edit' || $action == 'history' || $wpPreview ) {
                        if( $this->data['isarticle'] ) {
                                $s .= '<strong>' . $this->editThisPage() . '</strong>';

diff --git a/tests/phpunit/includes/upload/UploadFromUrlTest.php b/tests/phpunit/includes/upload/UploadFromUrlTest.php
index b2b2da7..c6498fa 100644 (file)
--- a/tests/phpunit/includes/upload/UploadFromUrlTest.php
+++ b/tests/phpunit/includes/upload/UploadFromUrlTest.php
@@ -232,7 +232,7 @@ class UploadFromUrlTest extends ApiTestCase {
                        $page->doDeleteArticle( '' );
                }
 
-               $this->assertFalse( (bool)$talk->getArticleId( Title::GAID_FOR_UPDATE ), 'User talk does not exist' );
+               $this->assertFalse( (bool)$talk->getArticleID( Title::GAID_FOR_UPDATE ), 'User talk does not exist' );
 
                $data = $this->doApiRequest( array(
                        'action' => 'upload',
@@ -249,7 +249,7 @@ class UploadFromUrlTest extends ApiTestCase {
                $job->run();
 
                $this->assertTrue( wfLocalFile( 'UploadFromUrlTest.png' )->exists() );
-               $this->assertTrue( (bool)$talk->getArticleId( Title::GAID_FOR_UPDATE ), 'User talk exists' );
+               $this->assertTrue( (bool)$talk->getArticleID( Title::GAID_FOR_UPDATE ), 'User talk exists' );
 
                $this->deleteFile( 'UploadFromUrlTest.png' );