| Index: trunk/phase3/includes/parser/ParserCache.php |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | */ |
| 82 | 82 | function getETag( $article, $popts ) { |
| 83 | 83 | return 'W/"' . $this->getParserOutputKey( $article, |
| 84 | | - $popts->optionsHash( ParserOptions::legacyOptions() ) ) . |
| | 84 | + $popts->optionsHash( ParserOptions::legacyOptions(), $article->getTitle() ) ) . |
| 85 | 85 | "--" . $article->getTouched() . '"'; |
| 86 | 86 | } |
| 87 | 87 | |
| — | — | @@ -130,7 +130,7 @@ |
| 131 | 131 | $usedOptions = ParserOptions::legacyOptions(); |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | | - return $this->getParserOutputKey( $article, $popts->optionsHash( $usedOptions ) ); |
| | 134 | + return $this->getParserOutputKey( $article, $popts->optionsHash( $usedOptions, $article->getTitle() ) ); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | /** |
| — | — | @@ -165,7 +165,8 @@ |
| 166 | 166 | $value = $this->mMemc->get( $parserOutputKey ); |
| 167 | 167 | if ( self::try116cache && !$value && strpos( $value, '*' ) !== -1 ) { |
| 168 | 168 | wfDebug( "New format parser cache miss.\n" ); |
| 169 | | - $parserOutputKey = $this->getParserOutputKey( $article, $popts->optionsHash( ParserOptions::legacyOptions() ) ); |
| | 169 | + $parserOutputKey = $this->getParserOutputKey( $article, |
| | 170 | + $popts->optionsHash( ParserOptions::legacyOptions(), $article->getTitle() ) ); |
| 170 | 171 | $value = $this->mMemc->get( $parserOutputKey ); |
| 171 | 172 | } |
| 172 | 173 | if ( !$value ) { |
| — | — | @@ -211,7 +212,7 @@ |
| 212 | 213 | $optionsKey->setContainsOldMagic( $parserOutput->containsOldMagic() ); |
| 213 | 214 | |
| 214 | 215 | $parserOutputKey = $this->getParserOutputKey( $article, |
| 215 | | - $popts->optionsHash( $optionsKey->mUsedOptions ) ); |
| | 216 | + $popts->optionsHash( $optionsKey->mUsedOptions, $article->getTitle() ) ); |
| 216 | 217 | |
| 217 | 218 | // Save the timestamp so that we don't have to load the revision row on view |
| 218 | 219 | $parserOutput->mTimestamp = $article->getTimestamp(); |