/**
* Get an instance of this object
*/
- function &singleton() {
+ public static function &singleton() {
static $instance;
if ( !isset( $instance ) ) {
global $parserMemc;
}
$this->mMemc->delete( $key );
$value = false;
-
} else {
+ if ( isset( $value->mTimestamp ) ) {
+ $article->mTimestamp = $value->mTimestamp;
+ }
wfIncrStats( "pcache_hit" );
}
} else {
}
function save( $parserOutput, &$article, &$user ){
+ global $wgParserCacheExpireTime;
$key = $this->getKey( $article, $user );
- $now = wfTimestampNow();
- $parserOutput->setCacheTime( $now );
- $parserOutput->mText .= "\n<!-- Saved in parser cache with key $key and timestamp $now -->\n";
- wfDebug( "Saved in parser cache with key $key and timestamp $now\n" );
-
- if( $parserOutput->containsOldMagic() ){
- $expire = 3600; # 1 hour
+
+ if( $parserOutput->getCacheTime() != -1 ) {
+
+ $now = wfTimestampNow();
+ $parserOutput->setCacheTime( $now );
+
+ // Save the timestamp so that we don't have to load the revision row on view
+ $parserOutput->mTimestamp = $article->getTimestamp();
+
+ $parserOutput->mText .= "\n<!-- Saved in parser cache with key $key and timestamp $now -->\n";
+ wfDebug( "Saved in parser cache with key $key and timestamp $now\n" );
+
+ if( $parserOutput->containsOldMagic() ){
+ $expire = 3600; # 1 hour
+ } else {
+ $expire = $wgParserCacheExpireTime;
+ }
+ $this->mMemc->set( $key, $parserOutput, $expire );
+
} else {
- $expire = 86400; # 1 day
+ wfDebug( "Parser output was marked as uncacheable and has not been saved.\n" );
}
- $this->mMemc->set( $key, $parserOutput, $expire );
+
}
+
}
-
?>