// Check to see if we are at the file scope
if ( !isset( $wgVersion ) ) {
- die( "Error, Setup.php must be included from the file scope, after DefaultSettings.php\n" );
+ echo "Error, Setup.php must be included from the file scope, after DefaultSettings.php\n";
+ die( -1 );
}
if( !isset( $wgProfiling ) )
$wgProfiling = false;
-if ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) {
- require_once( 'Profiling.php' );
+if ( function_exists( 'wfProfileIn' ) ) {
+ /* nada, everything should be done already */
+} elseif ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) {
+ require_once( 'Profiling.php' );
+ $wgProfiling = true;
+ if ($wgProfilerType == "") {
+ $wgProfiler = new Profiler();
+ } else {
+ $prclass="Profiler{$wgProfilerType}";
+ require_once( $prclass.".php" );
+ $wgProfiler = new $prclass();
+ }
} else {
- function wfProfileIn( $fn = '' ) {
- global $hackwhere, $wgDBname;
- $hackwhere[] = $fn;
- if (function_exists("setproctitle"))
- setproctitle($fn . " [$wgDBname]");
- }
- function wfProfileOut( $fn = '' ) {
- global $hackwhere, $wgDBname;
- if (count($hackwhere))
- array_pop($hackwhere);
- if (function_exists("setproctitle") && count($hackwhere))
- setproctitle($hackwhere[count($hackwhere)-1] . " [$wgDBname]");
- }
- function wfGetProfilingOutput( $s, $e ) {}
- function wfProfileClose() {}
+ require_once( 'ProfilerStub.php' );
}
$fname = 'Setup.php';
require_once( 'GlobalFunctions.php' );
require_once( 'Hooks.php' );
require_once( 'Namespace.php' );
-require_once( 'RecentChange.php' );
require_once( 'User.php' );
require_once( 'Skin.php' );
require_once( 'OutputPage.php' );
require_once( 'LinkCache.php' );
+require_once( 'LinkBatch.php' );
require_once( 'Title.php' );
require_once( 'Article.php' );
require_once( 'MagicWord.php' );
require_once( 'Block.php' );
require_once( 'MessageCache.php' );
-require_once( 'BlockCache.php' );
require_once( 'Parser.php' );
require_once( 'ParserCache.php' );
require_once( 'WebRequest.php' );
wfProfileOut( $fname.'-includes' );
wfProfileIn( $fname.'-misc1' );
-$wgIP = wfGetIP();
+$wgIP = false; # Load on demand
$wgRequest = new WebRequest();
-
+if ( function_exists( 'posix_uname' ) ) {
+ $wguname = posix_uname();
+}
# Useful debug output
if ( $wgCommandLineMode ) {
# wfDebug( '"' . implode( '" "', $argv ) . '"' );
$messageMemc =& wfGetMessageCacheStorage();
$parserMemc =& wfGetParserCacheStorage();
-wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
- "\nMessage cache: " . get_class( $messageMemc ) .
+wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
+ "\nMessage cache: " . get_class( $messageMemc ) .
"\nParser cache: " . get_class( $parserMemc ) . "\n" );
wfProfileOut( $fname.'-memcached' );
wfProfileIn( $fname.'-SetupSession' );
if ( $wgDBprefix ) {
- session_name( $wgDBname . '_' . $wgDBprefix . '_session' );
+ $wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
+} elseif ( $wgSharedDB ) {
+ $wgCookiePrefix = $wgSharedDB;
} else {
- session_name( $wgDBname . '_session' );
+ $wgCookiePrefix = $wgDBname;
+}
+
+# If session.auto_start is there, we can't touch session name
+#
+if (!ini_get('session.auto_start')) {
+ session_name( $wgCookiePrefix . '_session' );
}
-if( !$wgCommandLineMode && ( isset( $_COOKIE[session_name()] ) || isset( $_COOKIE[$wgDBname.'Token'] ) ) ) {
+if( !$wgCommandLineMode && ( isset( $_COOKIE[session_name()] ) || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
+ wfIncrStats( 'request_with_session' );
User::SetupSession();
$wgSessionStarted = true;
} else {
+ wfIncrStats( 'request_without_session' );
$wgSessionStarted = false;
}
wfProfileIn( $fname.'-database' );
if ( !$wgDBservers ) {
- $wgDBservers = array(array(
+ $wgDBservers = array(array(
'host' => $wgDBserver,
'user' => $wgDBuser,
'password' => $wgDBpassword,
require_once( "$IP/languages/Language.php" );
-function setupLangObj(&$langclass) {
+function setupLangObj($langclass) {
global $IP;
if( ! class_exists( $langclass ) ) {
wfProfileIn( $fname.'-User' );
# Skin setup functions
-# Entries can be added to this variable during the inclusion
+# Entries can be added to this variable during the inclusion
# of the extension file. Skins can then perform any necessary initialisation.
+#
+# require_once is slow even on the second call, so this needs to be outside the loop
+if ( count( $wgSkinExtensionFunctions ) ) {
+ require_once( 'PersistentObject.php' );
+}
foreach ( $wgSkinExtensionFunctions as $func ) {
- $func();
+ call_user_func( $func );
}
if( !is_object( $wgAuth ) ) {
# Prevent loading User settings from the DB.
$wgUser->setLoaded( true );
} else {
- $wgUser = User::loadFromSession();
+ $wgUser = null;
+ wfRunHooks('AutoAuthenticate',array(&$wgUser));
+ if ($wgUser === null) {
+ $wgUser = User::loadFromSession();
+ }
}
wfProfileOut( $fname.'-User' );
wfProfileIn( $fname.'-language2' );
// wgLanguageCode now specifically means the UI language
-$wgLanguageCode = $wgUser->getOption('language');
+$wgLanguageCode = $wgRequest->getText('uselang', '');
+if ($wgLanguageCode == '')
+ $wgLanguageCode = $wgUser->getOption('language');
# Validate $wgLanguageCode, which will soon be sent to an eval()
-if( empty( $wgLanguageCode ) || preg_match( '/^[^a-z-]*$/', $wgLanguageCode ) ) {
+if( empty( $wgLanguageCode ) || !preg_match( '/^[a-z]+(-[a-z]+)?$/', $wgLanguageCode ) ) {
$wgLanguageCode = $wgContLanguageCode;
}
$wgLang = &$wgContLang;
} else {
wfSuppressWarnings();
+ // Preload base classes to work around APC/PHP5 bug
+ include_once("$IP/languages/$wgLangClass.deps.php");
include_once("$IP/languages/$wgLangClass.php");
wfRestoreWarnings();
$wgLang = setupLangObj( $wgLangClass );
}
-wfProfileOut( $fname.'-language' );
+wfProfileOut( $fname.'-language2' );
wfProfileIn( $fname.'-MessageCache' );
$wgMessageCache = new MessageCache;
# SEARCH INDEX UPDATES, AND MANY MANY THINGS.
# DO NOT USE THIS MODE EXCEPT FOR TESTING RIGHT NOW.
#
-# To disable it, the easiest thing could be to uncomment the
+# To disable it, the easiest thing could be to uncomment the
# following; they should effectively disable the UI switch functionality
#
# $wgLangClass = $wgContLangClass;
# $wgLanguageCode = $wgContLanguageCode;
# $wgLang = $wgContLang;
#
-# TODO: Need to change reference to $wgLang to $wgContLang at proper
+# TODO: Need to change reference to $wgLang to $wgContLang at proper
# places, including namespaces, dates in signatures, magic words,
# and links
#
$wgOut = new OutputPage();
wfProfileOut( $fname.'-OutputPage' );
-wfProfileIn( $fname.'-BlockCache' );
-
-$wgBlockCache = new BlockCache( true );
-
-wfProfileOut( $fname.'-BlockCache' );
wfProfileIn( $fname.'-misc2' );
$wgDeferredUpdateList = array();
$wgPostCommitUpdateList = array();
-$wgLinkCache = new LinkCache();
$wgMagicWords = array();
$wgMwRedir =& MagicWord::get( MAG_REDIRECT );
-$wgParserCache = new ParserCache( $messageMemc );
if ( $wgUseXMLparser ) {
require_once( 'ParserXML.php' );
wfProfileIn( $fname.'-extensions' );
# Extension setup functions for extensions other than skins
-# Entries should be added to this variable during the inclusion
-# of the extension file. This allows the extension to perform
+# Entries should be added to this variable during the inclusion
+# of the extension file. This allows the extension to perform
# any necessary initialisation in the fully initialised environment
+if ( count( $wgExtensionFunctions ) ) {
+ require_once( 'PersistentObject.php' );
+}
foreach ( $wgExtensionFunctions as $func ) {
- $func();
+ call_user_func( $func );
}
wfDebug( "\n" );
dépôts / lhc / web / wiklou.git / blobdiff