* Don't set ETag if $wgUseETag = false

* Avoid casting page ID as int twice

diff --git a/includes/Article.php b/includes/Article.php
index 8061efb..bc7cd96 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -686,7 +686,10 @@ class Article {
 
                # Try file cache
                if( $oldid === 0 && $this->checkTouched() ) {
-                       $wgOut->setETag( $parserCache->getETag($this,$wgUser) );
+                       global $wgUseETag;
+                       if( $wgUseETag ) {
+                               $wgOut->setETag( $parserCache->getETag($this,$wgUser) );
+                       }
                        if( $wgOut->checkLastModified( $this->getTouched() ) ){
                                wfProfileOut( __METHOD__ );
                                return;

diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index bf11da2..7e61157 100644 (file)
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -35,9 +35,9 @@ class ParserCache {
                } else {
                        $edit = '';
                }
-               $pageid = intval( $article->getID() );
+               $pageid = $article->getID();
                $renderkey = (int)($action == 'render');
-               $key = wfMemcKey( 'pcache', 'idhash', "$pageid-$renderkey!$hash$edit" );
+               $key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}{$edit}" );
                return $key;
        }