dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Don't cast SpecialPageFactory::$list to an object"
[lhc/web/wiklou.git]
/
includes
/
WebStart.php
diff --git
a/includes/WebStart.php
b/includes/WebStart.php
index
e137628
..
2ae72dc
100644
(file)
--- a/
includes/WebStart.php
+++ b/
includes/WebStart.php
@@
-40,8
+40,6
@@
if ( ini_get( 'register_globals' ) ) {
header( 'X-Content-Type-Options: nosniff' );
$wgRequestTime = microtime( true );
header( 'X-Content-Type-Options: nosniff' );
$wgRequestTime = microtime( true );
-# getrusage() does not exist on the Microsoft Windows platforms, catching this
-$wgRUstart = function_exists( 'getrusage' ) ? getrusage() : array();
unset( $IP );
# Valid web server entry point, enable includes.
unset( $IP );
# Valid web server entry point, enable includes.
@@
-60,11
+58,12
@@
if ( $IP === false ) {
$IP = realpath( '.' ) ?: dirname( __DIR__ );
}
$IP = realpath( '.' ) ?: dirname( __DIR__ );
}
-# Start the autoloader, so that extensions can derive classes from core files
-require_once "$IP/includes/AutoLoader.php";
-
# Load the profiler
require_once "$IP/includes/profiler/Profiler.php";
# Load the profiler
require_once "$IP/includes/profiler/Profiler.php";
+$wgRUstart = wfGetRusage() ?: array();
+
+# Start the autoloader, so that extensions can derive classes from core files
+require_once "$IP/includes/AutoLoader.php";
# Load up some global defines.
require_once "$IP/includes/Defines.php";
# Load up some global defines.
require_once "$IP/includes/Defines.php";