http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55162
Revision: 55162
Author: aaron
Date: 2009-08-17 02:25:02 +0000 (Mon, 17 Aug 2009)
Log Message:
-----------
reverted r55161 - not needed
Modified Paths:
--------------
trunk/phase3/index.php
Modified: trunk/phase3/index.php
===================================================================
--- trunk/phase3/index.php 2009-08-17 01:54:31 UTC (rev 55161)
+++ trunk/phase3/index.php 2009-08-17 02:25:02 UTC (rev 55162)
@@ -57,6 +57,7 @@
$action = $wgRequest->getVal( 'action', 'view' );
$title = $wgRequest->getVal( 'title' );
+# Set title from request parameters
$wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
if( $wgTitle === NULL ) {
unset( $wgTitle );
@@ -80,26 +81,20 @@
// Raw pages should handle cache control on their own,
// even when using file cache. This reduces hits from clients.
if( $action != 'raw' && HTMLFileCache::useFileCache() ) {
- /* Set the title from the page ID if needed... */
- if( $curid = $wgRequest->getInt('curid') ) {
- $wgTitle = Title::newFromID( $curid );
- }
- if( !is_null($wgTitle) ) {
- /* 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 = MediaWiki::articleFromTitle(
$wgTitle );
- $wgArticle->viewUpdates();
- # Tell $wgOut that output is taken care of
- wfProfileOut( 'main-try-filecache' );
- $mediaWiki->restInPeace();
- exit;
+ /* 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 = MediaWiki::articleFromTitle( $wgTitle );
+ $wgArticle->viewUpdates();
+ # Tell $wgOut that output is taken care of
+ wfProfileOut( 'main-try-filecache' );
+ $mediaWiki->restInPeace();
+ exit;
}
}
wfProfileOut( 'main-try-filecache' );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
