Merge "Remove deprecated Article::forUpdate()"

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index ca8c91b..605e4ec 100644 (file)
--- 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 ce6407a..dc4198f 100644 (file)
--- 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).