From: daniel <daniel.kinzler@wikimedia.de>
Date: Thu, 26 Apr 2012 13:27:21 +0000 (+0200)
Subject: merged incoming
X-Git-Tag: 1.31.0-rc.0~22097^2^2~186
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=4c1973e52e8d3c3b7aa6203a985ff1cdf0de6d86;p=lhc%2Fweb%2Fwiklou.git

merged incoming
---

4c1973e52e8d3c3b7aa6203a985ff1cdf0de6d86
diff --cc includes/WikiPage.php
index 99b5d96e9e,5168d06d90..a71267b57b
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@@ -1663,9 -1663,8 +1663,8 @@@ class WikiPage extends Page 
  	 *
  	 * @deprecated in 1.WD: use prepareContentForEdit instead.
  	 */
 -	public function prepareTextForEdit( $text, $revid = null, User $user = null ) {  #FIXME: use prepareContentForEdit() instead #XXX: who uses this?!
 -		#TODO: log use of deprecated function
 +	public function prepareTextForEdit( $text, $revid = null, User $user = null ) {
 +		wfDeprecated( __METHOD__, '1.WD' );
- 
  		$content = ContentHandler::makeContent( $text, $this->getTitle() );
  		return $this->prepareContentForEdit( $content, $revid , $user );
  	}