From: Reedy <reedy@wikimedia.org>
Date: Thu, 19 Jan 2017 02:56:16 +0000 (+0000)
Subject: Mark Article::doEditContent() as deprecated
X-Git-Tag: 1.31.0-rc.0~4284
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=ca8e1ed0aadeae16de197aa5be512fb1ed93b5be;p=lhc%2Fweb%2Fwiklou.git

Mark Article::doEditContent() as deprecated

Bug: T155696
Change-Id: Ie91b428f3a5992ba85c6ca2b2909953d8fce139b
---

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index bde15d5afd..024a6f46c9 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -205,6 +205,8 @@ changes to languages because of Phabricator reports.
 * Revision::getText() (deprecated in 1.21) was removed.
 * Article::doEdit() and WikiPage::doEdit() (deprecated in 1.21) were removed.
 * Parser::replaceUnusualEscapes() (deprecated in 1.24) was removed.
+* Article::doEditContent() was marked as deprecated, to be removed in 1.30
+  or later.
 
 == Compatibility ==
 
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 2052ed3787..208fe1f580 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2030,6 +2030,7 @@ class Article implements Page {
 	public function doEditContent( Content $content, $summary, $flags = 0, $baseRevId = false,
 		User $user = null, $serialFormat = null
 	) {
+		wfDeprecated( __METHOD__, '1.29' );
 		return $this->mPage->doEditContent( $content, $summary, $flags, $baseRevId,
 			$user, $serialFormat
 		);