FileCache tweaks:

* Fix typo self -> MediaWiki
* View updates run on client cache hits
* Removed unneeded $wgOut->disable() call
* Disabled unused output on rawpage cache hits
* Removed redundant checkLastModified()

diff --git a/includes/HTMLFileCache.php b/includes/HTMLFileCache.php
index 3f27d44..7eca798 100644 (file)
--- a/includes/HTMLFileCache.php
+++ b/includes/HTMLFileCache.php
@@ -24,6 +24,7 @@ class HTMLFileCache {
 
        public function __construct( &$title, $type = 'view' ) {
                $this->mTitle = $title;
+               $type = $type ? $type : 'view';
                $this->mType = ($type == 'raw' || $type == 'view' ) ? $type : false;
                $this->fileCacheName(); // init name
        }

diff --git a/includes/RawPage.php b/includes/RawPage.php
index a7bc02c..5d5c081 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -153,10 +153,8 @@ class RawPage {
                if( HTMLFileCache::useFileCache() ) {
                        $cache = new HTMLFileCache( $this->mTitle, 'raw' );
                        if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
-                               /* Check incoming headers to see if client has this cached */
-                               if( !$wgOut->checkLastModified( $cache->fileCacheTime() ) ) {
-                                       $cache->loadFromFileCache();
-                               }
+                               $cache->loadFromFileCache();
+                               $wgOut->disable();
                                return;
                        } else {
                                ob_start( array(&$cache, 'saveToFileCache' ) );

diff --git a/index.php b/index.php
index 460c0ec..1418264 100644 (file)
--- a/index.php
+++ b/index.php
@@ -82,12 +82,11 @@ if( $wgUseFileCache && isset($wgTitle) ) {
                        /* Check incoming headers to see if client has this cached */
                        if( !$wgOut->checkLastModified( $cache->fileCacheTime() ) ) {
                                $cache->loadFromFileCache();
-                               # Do any stats increment/watchlist stuff
-                               $wgArticle = self::articleFromTitle( $wgTitle );
-                               $wgArticle->viewUpdates();
                        }
+                       # Do any stats increment/watchlist stuff
+                       $wgArticle = MediaWiki::articleFromTitle( $wgTitle );
+                       $wgArticle->viewUpdates();
                        # Tell $wgOut that output is taken care of
-                       $wgOut->disable();
                        wfProfileOut( 'main-try-filecache' );
                        $mediaWiki->restInPeace();
                        exit;