From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 17 Jan 2014 12:46:01 +0000 (+0000)
Subject: Merge "Remove deprecated Article::forUpdate()"
X-Git-Tag: 1.31.0-rc.0~17229
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=98ec2eb3a2011ce04d3c1e6cf8e81c8f1b6c15c0;hp=f7afda4643b3ba586498f226bf55de4ae4b80968;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove deprecated Article::forUpdate()"
---

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index ca8c91b796..605e4ec803 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -213,6 +213,7 @@ changes to languages because of Bugzilla reports.
 * ApiBase::getValidNamespaces() (deprecated in 1.17)
 * ApiMain::setCachePrivate() (deprecated in 1.17)
 * ApiMain::setVaryCookie (deprecated in 1.17)
+* Article::forUpdate() (deprecated in 1.18)
 * CategoryViewer::addSubcategory() (deprecated in 1.17)
 * EditPage::spamPage() (deprecated since 1.17)
 * Exif::getFormattedData() (deprecated in 1.18)
diff --git a/includes/Article.php b/includes/Article.php
index ce6407ae96..dc4198f739 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -460,14 +460,6 @@ class Article implements Page {
 		return $this->mContentObject;
 	}
 
-	/**
-	 * No-op
-	 * @deprecated since 1.18
-	 */
-	public function forUpdate() {
-		wfDeprecated( __METHOD__, '1.18' );
-	}
-
 	/**
 	 * Returns true if the currently-referenced revision is the current edit
 	 * to this page (and it exists).