[MediaWiki-CVS] SVN: [97637] trunk/phase3/includes/parser/ParserCache.php

[robin]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97637

Revision: 97637
Author:   robin
Date:     2011-09-20 15:58:01 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
r97636: ParserCache meant to be committed already too

Modified Paths:
--------------
    trunk/phase3/includes/parser/ParserCache.php

Modified: trunk/phase3/includes/parser/ParserCache.php
===================================================================
--- trunk/phase3/includes/parser/ParserCache.php        2011-09-20 15:55:08 UTC 
(rev 97636)
+++ trunk/phase3/includes/parser/ParserCache.php        2011-09-20 15:58:01 UTC 
(rev 97637)
@@ -80,7 +80,7 @@
         */
        function getETag( $article, $popts ) {
                return 'W/"' . $this->getParserOutputKey( $article,
-                       $popts->optionsHash( ParserOptions::legacyOptions() ) ) 
.
+                       $popts->optionsHash( ParserOptions::legacyOptions(), 
$article->getTitle() ) ) .
                                "--" . $article->getTouched() . '"';
        }
 
@@ -130,7 +130,7 @@
                        $usedOptions = ParserOptions::legacyOptions();
                }
 
-               return $this->getParserOutputKey( $article, 
$popts->optionsHash( $usedOptions ) );
+               return $this->getParserOutputKey( $article, 
$popts->optionsHash( $usedOptions, $article->getTitle() ) );
        }
 
        /**
@@ -165,7 +165,8 @@
                $value = $this->mMemc->get( $parserOutputKey );
                if ( self::try116cache && !$value && strpos( $value, '*' ) !== 
-1 ) {
                        wfDebug( "New format parser cache miss.\n" );
-                       $parserOutputKey = $this->getParserOutputKey( $article, 
$popts->optionsHash( ParserOptions::legacyOptions() ) );
+                       $parserOutputKey = $this->getParserOutputKey( $article,
+                               $popts->optionsHash( 
ParserOptions::legacyOptions(), $article->getTitle() ) );
                        $value = $this->mMemc->get( $parserOutputKey );
                }
                if ( !$value ) {
@@ -211,7 +212,7 @@
                        $optionsKey->setContainsOldMagic( 
$parserOutput->containsOldMagic() );
 
                        $parserOutputKey = $this->getParserOutputKey( $article,
-                               $popts->optionsHash( $optionsKey->mUsedOptions 
) );
+                               $popts->optionsHash( $optionsKey->mUsedOptions, 
$article->getTitle() ) );
 
                        // Save the timestamp so that we don't have to load the 
revision row on view
                        $parserOutput->mTimestamp = $article->getTimestamp();


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs