Imported the register_globals hack from REL1_2. Also starting work on

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 18c2e29..f421e05 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -49,6 +49,8 @@ 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" );
@@ -57,22 +59,23 @@ global $wgArticle, $wgDeferredUpdateList, $wgLinkCache;
 global $wgMemc, $wgMagicWords, $wgMwRedir, $wgDebugLogFile;
 global $wgMessageCache, $wgUseMemCached, $wgUseDatabaseMessages;
 global $wgMsgCacheExpiry, $wgDBname, $wgCommandLineMode;
-global $wgBlockCache;
+global $wgBlockCache, $wgParserCache, $wgParser;
 
 # Useful debug output
 if ( function_exists( "getallheaders" ) ) {
        wfDebug( "\nStart request\n" );
-       wfDebug( "$REQUEST_METHOD $REQUEST_URI\n" );
+       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
        $headers = getallheaders();
        foreach ($headers as $name => $value) {
                wfDebug( "$name: $value\n" );
        }
        wfDebug( "\n" );
 } else {
-       wfDebug( "$REQUEST_METHOD $REQUEST_URI\n" );
+       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
 }
 
-
+# Set up Memcached
+#
 class MemCachedClientforWiki extends memcached {
        function _debugprint( $text ) {
                wfDebug( "memcached: $text\n" );
@@ -125,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" );
@@ -140,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;
@@ -156,6 +159,9 @@ $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 );