Fix PHP strict standard. Thanks to Siebrand.

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

diff --git a/includes/ParserCache.php b/includes/ParserCache.php
index 712c664..129b713 100644 (file)
--- a/includes/ParserCache.php
+++ b/includes/ParserCache.php
@@ -1,19 +1,14 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage Cache
- */
-
-/**
- *
- * @package MediaWiki
+ * @addtogroup Cache
+ * @todo document
  */
 class ParserCache {
        /**
         * Get an instance of this object
         */
-       function &singleton() {
+       public static function &singleton() {
                static $instance;
                if ( !isset( $instance ) ) {
                        global $parserMemc;
@@ -28,14 +23,14 @@ class ParserCache {
         *
         * @param object $memCached
         */
-       function ParserCache( &$memCached ) {
+       function __construct( &$memCached ) {
                $this->mMemc =& $memCached;
        }
 
        function getKey( &$article, &$user ) {
-               global $wgDBname, $action;
+               global $action;
                $hash = $user->getPageRenderingHash();
-               if( !$article->mTitle->userCanEdit() ) {
+               if( !$article->mTitle->quickUserCan( 'edit' ) ) {
                        // section edit links are suppressed even if the user has them on
                        $edit = '!edit=0';
                } else {
@@ -43,7 +38,7 @@ class ParserCache {
                }
                $pageid = intval( $article->getID() );
                $renderkey = (int)($action == 'render');
-               $key = "$wgDBname:pcache:idhash:$pageid-$renderkey!$hash$edit";
+               $key = wfMemcKey( 'pcache', 'idhash', "$pageid-$renderkey!$hash$edit" );
                return $key;
        }
 
@@ -56,8 +51,6 @@ class ParserCache {
                $fname = 'ParserCache::get';
                wfProfileIn( $fname );
 
-               $hash = $user->getPageRenderingHash();
-               $pageid = intval( $article->getID() );
                $key = $this->getKey( $article, $user );
 
                wfDebug( "Trying parser cache $key\n" );
@@ -97,23 +90,30 @@ class ParserCache {
        function save( $parserOutput, &$article, &$user ){
                global $wgParserCacheExpireTime;
                $key = $this->getKey( $article, $user );
-               $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->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 );
 
-               if( $parserOutput->containsOldMagic() ){
-                       $expire = 3600; # 1 hour
                } else {
-                       $expire = $wgParserCacheExpireTime;
+                       wfDebug( "Parser output was marked as uncacheable and has not been saved.\n" );
                }
-               $this->mMemc->set( $key, $parserOutput, $expire );
        }
+
 }
 
 
-?>