Refactored parser output handling slightly, and added a hook function, to allow exten...

[lhc/web/wiklou.git] / includes / ParserCache.php

diff --git a/includes/ParserCache.php b/includes/ParserCache.php
index 8b3cf9a..612790a 100644 (file)
--- a/includes/ParserCache.php
+++ b/includes/ParserCache.php
@@ -10,6 +10,18 @@
  * @package MediaWiki
  */
 class ParserCache {
+       /**
+        * Get an instance of this object
+        */
+       public static function &singleton() {
+               static $instance;
+               if ( !isset( $instance ) ) {
+                       global $parserMemc;
+                       $instance = new ParserCache( $parserMemc );
+               }
+               return $instance;
+       }
+
        /**
         * Setup a cache pathway with a given back-end storage mechanism.
         * May be a memcached client or a BagOStuff derivative.
@@ -21,10 +33,17 @@ class ParserCache {
        }
 
        function getKey( &$article, &$user ) {
-               global $wgDBname;
+               global $wgDBname, $action;
                $hash = $user->getPageRenderingHash();
+               if( !$article->mTitle->userCanEdit() ) {
+                       // section edit links are suppressed even if the user has them on
+                       $edit = '!edit=0';
+               } else {
+                       $edit = '';
+               }
                $pageid = intval( $article->getID() );
-               $key = "$wgDBname:pcache:idhash:$pageid-$hash";
+               $renderkey = (int)($action == 'render');
+               $key = "$wgDBname:pcache:idhash:$pageid-$renderkey!$hash$edit";
                return $key;
        }
 
@@ -59,8 +78,10 @@ class ParserCache {
                                }
                                $this->mMemc->delete( $key );
                                $value = false;
-
                        } else {
+                               if ( isset( $value->mTimestamp ) ) {
+                                       $article->mTimestamp = $value->mTimestamp;
+                               }
                                wfIncrStats( "pcache_hit" );
                        }
                } else {
@@ -74,20 +95,33 @@ class ParserCache {
        }
 
        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 );
+               
        }
+       
 }
 
-
 ?>