From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 29 Sep 2016 07:33:52 +0000 (+0000)
Subject: Merge "Emit deprecation warnings for Article::doEdit and WikiPage::doEdit"
X-Git-Tag: 1.31.0-rc.0~5276
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=fd5127b4f0278299760c823eb0c68523ad1cf3cc;hp=83bfc8721c0bbc4a2b6e3e7e13b182524ecad933;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 770ae31af6..f57df9b4b2 100644
--- 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 41e9e4f705..9befdcd389 100644
--- 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() );