From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 20 Sep 2016 22:08:04 +0000 (+0000)
Subject: Merge "Emit deprecation warnings from Article::fetchContent"
X-Git-Tag: 1.31.0-rc.0~5447
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=1827c891f549e3163d9e87390c6c6e939e8cf36b;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Emit deprecation warnings from Article::fetchContent"
---

1827c891f549e3163d9e87390c6c6e939e8cf36b
diff --combined includes/page/Article.php
index af897ddc98,067879d426..ba0a484ec1
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@@ -99,7 -99,9 +99,7 @@@ class Article implements Page 
  	 */
  	public static function newFromID( $id ) {
  		$t = Title::newFromID( $id );
 -		# @todo FIXME: Doesn't inherit right
 -		return $t == null ? null : new self( $t );
 -		# return $t == null ? null : new static( $t ); // PHP 5.3
 +		return $t == null ? null : new static( $t );
  	}
  
  	/**
@@@ -333,7 -335,7 +333,7 @@@
  	function fetchContent() {
  		// BC cruft!
  
- 		ContentHandler::deprecated( __METHOD__, '1.21' );
+ 		wfDeprecated( __METHOD__, '1.21' );
  
  		if ( $this->mContentLoaded && $this->mContent ) {
  			return $this->mContent;
@@@ -1932,13 -1934,12 +1932,13 @@@
  
  	/**
  	 * Check if the page can be cached
 +	 * @param integer $mode One of the HTMLFileCache::MODE_* constants (since 1.28)
  	 * @return bool
  	 */
 -	public function isFileCacheable() {
 +	public function isFileCacheable( $mode = HTMLFileCache::MODE_NORMAL ) {
  		$cacheable = false;
  
 -		if ( HTMLFileCache::useFileCache( $this->getContext() ) ) {
 +		if ( HTMLFileCache::useFileCache( $this->getContext(), $mode ) ) {
  			$cacheable = $this->mPage->getId()
  				&& !$this->mRedirectedFrom && !$this->getTitle()->isRedirect();
  			// Extension may have reason to disable file caching on some pages.
@@@ -2139,16 -2140,8 +2139,16 @@@
  	 * Call to WikiPage function for backwards compatibility.
  	 * @see WikiPage::doPurge
  	 */
 -	public function doPurge() {
 -		return $this->mPage->doPurge();
 +	public function doPurge( $flags = WikiPage::PURGE_ALL ) {
 +		return $this->mPage->doPurge( $flags );
 +	}
 +
 +	/**
 +	 * Call to WikiPage function for backwards compatibility.
 +	 * @see WikiPage::getLastPurgeTimestamp
 +	 */
 +	public function getLastPurgeTimestamp() {
 +		return $this->mPage->getLastPurgeTimestamp();
  	}
  
  	/**
@@@ -2334,10 -2327,9 +2334,10 @@@
  	/**
  	 * Call to WikiPage function for backwards compatibility.
  	 * @see WikiPage::getText
 +	 * @deprecated since 1.21 use WikiPage::getContent() instead
  	 */
  	public function getText( $audience = Revision::FOR_PUBLIC, User $user = null ) {
 -		ContentHandler::deprecated( __METHOD__, '1.21' );
 +		wfDeprecated( __METHOD__, '1.21' );
  		return $this->mPage->getText( $audience, $user );
  	}