Mark Article::doEditContent() as deprecated

Bug: T155696
Change-Id: Ie91b428f3a5992ba85c6ca2b2909953d8fce139b

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index bde15d5..024a6f4 100644 (file)
--- 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 2052ed3..208fe1f 100644 (file)
--- 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
                );