| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -686,7 +686,10 @@ |
| 687 | 687 | |
| 688 | 688 | # Try file cache |
| 689 | 689 | if( $oldid === 0 && $this->checkTouched() ) { |
| 690 | | - $wgOut->setETag( $parserCache->getETag($this,$wgUser) ); |
| | 690 | + global $wgUseETag; |
| | 691 | + if( $wgUseETag ) { |
| | 692 | + $wgOut->setETag( $parserCache->getETag($this,$wgUser) ); |
| | 693 | + } |
| 691 | 694 | if( $wgOut->checkLastModified( $this->getTouched() ) ){ |
| 692 | 695 | wfProfileOut( __METHOD__ ); |
| 693 | 696 | return; |
| Index: trunk/phase3/includes/parser/ParserCache.php |
| — | — | @@ -35,9 +35,9 @@ |
| 36 | 36 | } else { |
| 37 | 37 | $edit = ''; |
| 38 | 38 | } |
| 39 | | - $pageid = intval( $article->getID() ); |
| | 39 | + $pageid = $article->getID(); |
| 40 | 40 | $renderkey = (int)($action == 'render'); |
| 41 | | - $key = wfMemcKey( 'pcache', 'idhash', "$pageid-$renderkey!$hash$edit" ); |
| | 41 | + $key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}{$edit}" ); |
| 42 | 42 | return $key; |
| 43 | 43 | } |
| 44 | 44 | |