Tell regexp parser to use extra analysis on external link regexp;

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

diff --git a/includes/Setup.php b/includes/Setup.php
index adea16a..46bd30b 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -16,7 +16,7 @@ if( defined( 'MEDIAWIKI' ) ) {
 # setting up a few globals.
 #
 
-global $wgProfiling, $wgProfileSampleRate, $wgIP, $wgUseSquid;
+global $wgProfiling, $wgProfileSampleRate, $wgIP, $wgUseSquid, $IP;
 
 if( !isset( $wgProfiling ) )
        $wgProfiling = false;
@@ -71,9 +71,11 @@ require_once( 'Block.php' );
 require_once( 'MessageCache.php' );
 require_once( 'BlockCache.php' );
 require_once( 'Parser.php' );
+require_once( 'ParserXML.php' );
 require_once( 'ParserCache.php' );
 require_once( 'WebRequest.php' );
 require_once( 'LoadBalancer.php' );
+require_once( 'HistoryBlob.php' );
 
 $wgRequest = new WebRequest();
 
@@ -87,7 +89,7 @@ global $wgArticle, $wgDeferredUpdateList, $wgLinkCache;
 global $wgMemc, $wgMagicWords, $wgMwRedir, $wgDebugLogFile;
 global $wgMessageCache, $wgUseMemCached, $wgUseDatabaseMessages;
 global $wgMsgCacheExpiry, $wgCommandLineMode;
-global $wgBlockCache, $wgParserCache, $wgParser, $wgDBConnections, $wgMsgParserOptions;
+global $wgBlockCache, $wgParserCache, $wgParser, $wgMsgParserOptions;
 global $wgLoadBalancer, $wgDBservers, $wgDebugDumpSql;
 global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBtype;
 global $wgUseOldExistenceCheck, $wgEnablePersistentLC;
@@ -181,7 +183,7 @@ if( $wgUseMemCached ) {
 wfProfileOut( $fname.'-memcached' );
 wfProfileIn( $fname.'-SetupSession' );
 
-if( !$wgCommandLineMode && ( isset( $_COOKIE[ini_get('session.name')] ) || isset( $_COOKIE[$wgDBname.'Password'] ) ) ) {
+if( !$wgCommandLineMode && ( isset( $_COOKIE[ini_get('session.name')] ) || isset( $_COOKIE[$wgDBname.'Token'] ) ) ) {
        User::SetupSession();
        $wgSessionStarted = true;
 } else {
@@ -215,6 +217,11 @@ foreach ( $wgSkinExtensionFunctions as $func ) {
        $func();
 }
 
+if( !is_object( $wgAuth ) ) {
+       require_once( 'AuthPlugin.php' );
+       $wgAuth = new AuthPlugin();
+}
+
 if( $wgCommandLineMode ) {
        # Used for some maintenance scripts; user session cookies can screw things up
        # when the database is in an in-between state.
@@ -227,12 +234,12 @@ wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-language' );
 
 function setupLangObj(&$langclass, $langcode) {
-       global $wgUseLatin1;
+       global $wgUseLatin1, $IP;
 
 
        if( ! class_exists( $langclass ) ) {
                # Default to English/UTF-8
-               require_once( 'languages/LanguageUtf8.php' );
+               require_once( "$IP/languages/LanguageUtf8.php" );
                $langclass = 'LanguageUtf8';
        }
 
@@ -243,7 +250,7 @@ function setupLangObj(&$langclass, $langcode) {
 
        if( $wgUseLatin1 ) {
                # For non-UTF-8 latin-1 downconversion
-               require_once( 'languages/LanguageLatin1.php' );
+               require_once( "$IP/languages/LanguageLatin1.php" );
                $xxx = new LanguageLatin1( $lang );
                unset( $lang );
                $lang = $xxx;
@@ -251,7 +258,7 @@ function setupLangObj(&$langclass, $langcode) {
        return $lang;
 }
 
-require_once( 'languages/Language.php' );
+require_once( "$IP/languages/Language.php" );
 
 # $wgLanguageCode may be changed later to fit with user preference.
 # The content language will remain fixed as per the configuration,
@@ -275,7 +282,7 @@ $wgLangClass = 'Language'. str_replace( '-', '_', ucfirst( $wgLanguageCode ) );
 if( $wgLangClass == $wgContLangClass ) {
        $wgLang = &$wgContLang;
 } else {
-       require_once("languages/$wgLangClass.php");
+       require_once("$IP/languages/$wgLangClass.php");
        $wgLang = setupLangObj( $wgLangClass, $wgLanguageCode );
 }
 
@@ -336,10 +343,11 @@ $wgDeferredUpdateList = array();
 $wgLinkCache = new LinkCache();
 $wgMagicWords = array();
 $wgMwRedir =& MagicWord::get( MAG_REDIRECT );
-$wgParserCache = new ParserCache();
-$wgParser = new Parser();
+$wgParserCache = new ParserCache( $messageMemc );
+
+if ( $wgUseXMLparser ) $wgParser = new ParserXML();
+else $wgParser = new Parser();
 $wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
-$wgDBConnections = array();
 $wgMsgParserOptions = ParserOptions::newFromUser($wgUser);
 wfSeedRandom();