X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSetup.php;h=f421e05aea24d7d507fb179b026a7516581ac9c7;hb=9e53bfc81c11a5880291e0c4ac3e84d84ad3f821;hp=2149dce12f4c9875b9be4d932c1760c848fc0f4a;hpb=f8a0e5f9399b3257b5a2f3ff74c3936f3687256e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Setup.php b/includes/Setup.php
index 2149dce12f..f421e05aea 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -1,4 +1,4 @@
-<?
+<?php
 # The main wiki script and things like database
 # conversion and maintenance scripts all share a
 # common setup of including lots of classes and
@@ -48,6 +48,9 @@ include_once( "Block.php" );
 include_once( "SearchEngine.php" );
 include_once( "DifferenceEngine.php" );
 include_once( "MessageCache.php" );
+include_once( "BlockCache.php" );
+include_once( "Parser.php" );
+include_once( "ParserCache.php" );
 
 wfProfileOut( "$fname-includes" );
 wfProfileIn( "$fname-memcached" );
@@ -56,7 +59,23 @@ global $wgArticle, $wgDeferredUpdateList, $wgLinkCache;
 global $wgMemc, $wgMagicWords, $wgMwRedir, $wgDebugLogFile;
 global $wgMessageCache, $wgUseMemCached, $wgUseDatabaseMessages;
 global $wgMsgCacheExpiry, $wgDBname, $wgCommandLineMode;
+global $wgBlockCache, $wgParserCache, $wgParser;
+
+# Useful debug output
+if ( function_exists( "getallheaders" ) ) {
+	wfDebug( "\nStart request\n" );
+	wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
+	$headers = getallheaders();
+	foreach ($headers as $name => $value) {
+		wfDebug( "$name: $value\n" );
+	}
+	wfDebug( "\n" );
+} else {
+	wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
+}
 
+# Set up Memcached
+#
 class MemCachedClientforWiki extends memcached {
 	function _debugprint( $text ) {
 		wfDebug( "memcached: $text\n" );
@@ -109,9 +128,6 @@ include_once( "Language.php" );
 
 $wgMessageCache = new MessageCache; 
 
-$wgOut = new OutputPage();
-wfDebug( "\n\n" );
-
 $wgLangClass = "Language" . ucfirst( $wgLanguageCode );
 if( ! class_exists( $wgLangClass ) ) {
 	include_once( "LanguageUtf8.php" );
@@ -124,6 +140,9 @@ if ( !is_object($wgLang) ) {
 }
 $wgMessageCache->initialise( $wgUseMemCached, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname );
 
+$wgOut = new OutputPage();
+wfDebug( "\n\n" );
+
 if ( $wgUseDynamicDates ) {
 	include_once( "DateFormatter.php" );
 	global $wgDateFormatter;
@@ -134,11 +153,15 @@ if( !$wgCommandLineMode && isset( $_COOKIE[ini_get("session.name")] )  ) {
 	User::SetupSession();
 }
 
+$wgBlockCache = new BlockCache( true );
 $wgUser = User::loadFromSession();
 $wgDeferredUpdateList = array();
 $wgLinkCache = new LinkCache();
 $wgMagicWords = array();
 $wgMwRedir =& MagicWord::get( MAG_REDIRECT );
+$wgParserCache = new ParserCache();
+$wgParser = new Parser();
+$wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
 
 wfProfileOut( "$fname-misc" );
 wfProfileOut( $fname );