Merge "Emit deprecation warnings for Article::doEdit and WikiPage::doEdit"

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 770ae31..f57df9b 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2114,7 +2114,7 @@ class Article implements Page {
         * @deprecated since 1.21: use doEditContent() instead.
         */
        public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
-               ContentHandler::deprecated( __METHOD__, '1.21' );
+               wfDeprecated( __METHOD__, '1.21' );
                return $this->mPage->doEdit( $text, $summary, $flags, $baseRevId, $user );
        }
 

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 41e9e4f..9befdcd 100644 (file)
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1577,7 +1577,7 @@ class WikiPage implements Page, IDBAccessObject {
         * @deprecated since 1.21: use doEditContent() instead.
         */
        public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
-               ContentHandler::deprecated( __METHOD__, '1.21' );
+               wfDeprecated( __METHOD__, '1.21' );
 
                $content = ContentHandler::makeContent( $text, $this->getTitle() );