From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 22 May 2008 15:02:33 +0000 (+0000)
Subject: Revision:getId() not getID()
X-Git-Tag: 1.31.0-rc.0~47474
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=b690c9ac4d2d5aeb2c6a2505140c5e537d59cf7f;p=lhc%2Fweb%2Fwiklou.git

Revision:getId() not getID()
---

diff --git a/includes/Article.php b/includes/Article.php
index dedf4e76cd..82cf979fbc 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -438,7 +438,7 @@ class Article {
 		$this->mComment   = $revision->getComment();
 		$this->mTimestamp = wfTimestamp( TS_MW, $revision->getTimestamp() );
 
-		$this->mRevIdFetched = $revision->getID();
+		$this->mRevIdFetched = $revision->getId();
 		$this->mContentLoaded = true;
 		$this->mRevision =& $revision;
 
@@ -590,7 +590,7 @@ class Article {
 			$this->mTimestamp = $this->mLastRevision->getTimestamp();
 			$this->mComment   = $this->mLastRevision->getComment();
 			$this->mMinorEdit = $this->mLastRevision->isMinor();
-			$this->mRevIdFetched = $this->mLastRevision->getID();
+			$this->mRevIdFetched = $this->mLastRevision->getId();
 		}
 	}
 
diff --git a/includes/SpecialMergeHistory.php b/includes/SpecialMergeHistory.php
index f891f0e20a..6183374ee4 100644
--- a/includes/SpecialMergeHistory.php
+++ b/includes/SpecialMergeHistory.php
@@ -232,7 +232,7 @@ class MergehistoryForm {
 		$checkBox = wfRadio( "mergepoint", $ts, false );
 
 		$pageLink = $this->sk->makeKnownLinkObj( $rev->getTitle(),
-			htmlspecialchars( $wgLang->timeanddate( $ts ) ), 'oldid=' . $rev->getID() );
+			htmlspecialchars( $wgLang->timeanddate( $ts ) ), 'oldid=' . $rev->getId() );
 		if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
 			$pageLink = '<span class="history-deleted">' . $pageLink . '</span>';
 		}
diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php
index e0a087a72c..337fffd6ce 100644
--- a/includes/SpecialRevisiondelete.php
+++ b/includes/SpecialRevisiondelete.php
@@ -272,7 +272,7 @@ class RevisionDeleteForm {
 		);
 		if( $this->deleteKey=='oldid' ) {
 			foreach( $revObjs as $rev )
-				$hidden[] = wfHidden( 'oldid[]', $rev->getID() );
+				$hidden[] = wfHidden( 'oldid[]', $rev->getId() );
 		} else {
 			foreach( $revObjs as $rev )
 				$hidden[] = wfHidden( 'artimestamp[]', $rev->getTimestamp() );
@@ -1287,7 +1287,7 @@ class RevisionDeleter {
 	function updateArchFiles( $file, $bitfield ) {
 		$this->dbw->update( 'filearchive',
 			array( 'fa_deleted' => $bitfield ),
-			array( 'fa_id' => $file->getID() ),
+			array( 'fa_id' => $file->getId() ),
 			__METHOD__ );
 	}