X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=index.php;h=ecaf210a5e3402f46b39b0e6493582d95d45aa10;hb=9d2767bda33369f8c587adbaa65586be3270bd60;hp=22e74e9e9ca8d84f9d6e691319417020c9d08453;hpb=a7e6cd9d5d2b1f65a3ecb2825fc76774d2d60286;p=lhc%2Fweb%2Fwiklou.git

diff --git a/index.php b/index.php
index 22e74e9e9c..ecaf210a5e 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@
  *
  * ----------
  *
- * 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.
@@ -32,6 +32,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
  */
 
 
@@ -47,7 +49,7 @@ wfProfileIn( 'main-misc-setup' );
 OutputPage::setEncodings(); # Not really used yet
 
 $maxLag = $wgRequest->getVal( 'maxlag' );
-if( !is_null($maxLag) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
+if( !is_null( $maxLag ) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
 	exit;
 }
 
@@ -55,8 +57,9 @@ if( !is_null($maxLag) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
 $action = $wgRequest->getVal( 'action', 'view' );
 $title = $wgRequest->getVal( 'title' );
 
+# Set title from request parameters
 $wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
-if( $wgTitle === NULL ) {
+if( $wgTitle === null ) {
 	unset( $wgTitle );
 }
 
@@ -73,21 +76,22 @@ if( $wgUseAjax && $action == 'ajax' ) {
 	exit;
 }
 
-if( $wgUseFileCache && isset($wgTitle) ) {
+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 );
+		$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;
@@ -110,7 +114,7 @@ $mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
 $mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
 $mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
 
-$mediaWiki->initialize( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
+$mediaWiki->performRequestForTitle( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
 $mediaWiki->finalCleanup( $wgDeferredUpdateList, $wgOut );
 
 # Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup