*
* ----------
*
- * Copyright (C) 2001-2008 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
+ * Copyright (C) 2001-2009 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
* Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason,
* Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor,
* Aaron Schulz and others.
if( $wgUseFileCache && isset($wgTitle) ) {
wfProfileIn( 'main-try-filecache' );
- if( HTMLFileCache::useFileCache() ) {
+ // Raw pages should handle cache control on their own,
+ // even when using file cache. This reduces hits from clients.
+ if( $action != 'raw' && HTMLFileCache::useFileCache() ) {
/* Try low-level file cache hit */
$cache = new HTMLFileCache( $wgTitle, $action );
if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
/* 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;