From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Tue, 23 Jun 2009 21:52:39 +0000 (+0000)
Subject: Core changes for r52307
X-Git-Tag: 1.31.0-rc.0~41236
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=480741ce4b398fef9afe4a6ec595b4ec7662662c;p=lhc%2Fweb%2Fwiklou.git

Core changes for r52307
---

diff --git a/includes/Article.php b/includes/Article.php
index 486c8bb4c7..a7b75c5f73 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3675,6 +3675,19 @@ class Article {
 	 * @param $cache Boolean
 	 */
 	public function outputWikiText( $text, $cache = true ) {
+		global $wgOut;
+		
+		$parserOutput = $this->outputFromWikitext( $text, $cache );
+
+		$wgOut->addParserOutput( $parserOutput );
+	}
+	
+	/**
+	 * This does all the heavy lifting for outputWikitext, except it returns the parser
+	 * output instead of sending it straight to $wgOut. Makes things nice and simple for,
+	 * say, embedding thread pages within a discussion system (LiquidThreads)
+	 */
+	public function outputFromWikitext( $text, $cache = true ) {
 		global $wgParser, $wgOut, $wgEnableParserCache, $wgUseFileCache;
 
 		$popts = $wgOut->parserOptions();
@@ -3737,8 +3750,8 @@ class Article {
 				$u->doUpdate();
 			}
 		}
-
-		$wgOut->addParserOutput( $parserOutput );
+		
+		return $parserOutput;
 	}
 
 	/**
@@ -3797,4 +3810,46 @@ class Article {
 			);
 		}
 	}
+	
+	function tryParserCache( $parserOptions ) {
+		$parserCache = ParserCache::singleton();
+		$parserOutput = $parserCache->get( $this, $parserOptions );
+		if ( $parserOutput !== false ) {
+			return $parserOutput;
+		} else {
+			return false;
+		}
+	}
+	
+	/** Lightweight method to get the parser output for a page, checking the parser cache
+	  * and so on. Doesn't consider most of the stuff that Article::view is forced to
+	  * consider, so it's not appropriate to use there. */
+	function getParserOutput( $oldid = null ) {
+		global $wgEnableParserCache, $wgUser, $wgOut;
+
+		// Should the parser cache be used?
+		$pcache = $wgEnableParserCache &&
+		          intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 &&
+		          $this->exists() &&
+				  $oldid === null;
+				  
+		wfDebug( __METHOD__.': using parser cache: ' . ( $pcache ? 'yes' : 'no' ) . "\n" );
+		if ( $wgUser->getOption( 'stubthreshold' ) ) {
+			wfIncrStats( 'pcache_miss_stub' );
+		}
+
+		$parserOutput = false;
+		if ( $pcache ) {
+			$parserOutput = $this->tryParserCache( $wgOut->parserOptions() );
+		}
+
+		if ( $parserOutput === false ) {
+			// Cache miss; parse and output it.
+			$rev = Revision::newFromTitle( $this->getTitle(), $oldid );
+			
+			return $this->outputFromWikitext( $rev->getText(), $pcache );
+		} else {
+			return $parserOutput;
+		}
+	}
 }
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 623411bbec..4e02598aeb 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -714,13 +714,15 @@ class OutputPage {
 	/**
 	 * @param Article $article
 	 * @param User    $user
+	 * 
+	 * Now a wrapper around Article::tryParserCache()
 	 *
 	 * @return bool True if successful, else false.
 	 */
 	public function tryParserCache( &$article ) {
-		$parserCache = ParserCache::singleton();
-		$parserOutput = $parserCache->get( $article, $this->parserOptions() );
-		if ( $parserOutput !== false ) {
+		$parserOutput = $article->tryParserCache( $this->parserOptions() );
+		
+		if ($parserOutput !== false) {
 			$this->addParserOutput( $parserOutput );
 			return true;
 		} else {