diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2010-07-28 11:52:48 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2010-07-28 11:52:48 +0200 |
| commit | 222b01f5169f1c7e69762e0e8904c24f78f71882 (patch) | |
| tree | 8e932e12546bb991357ec48eb1638d1770be7a35 /includes/WebStart.php | |
| parent | 00ab76a6b686e98a914afc1975812d2b1aaa7016 (diff) | |
update to MediaWiki 1.16.0
Diffstat (limited to 'includes/WebStart.php')
| -rw-r--r-- | includes/WebStart.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/includes/WebStart.php b/includes/WebStart.php index edc58cb3..d62b4a62 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -46,7 +46,6 @@ if ( function_exists ( 'getrusage' ) ) { $wgRUstart = array(); } unset( $IP ); -@ini_set( 'allow_url_fopen', 0 ); # For security # Valid web server entry point, enable includes. # Please don't move this line to includes/Defines.php. This line essentially @@ -66,7 +65,11 @@ if ( $IP === false ) { # Start profiler -require_once( "$IP/StartProfiler.php" ); +if( file_exists("$IP/StartProfiler.php") ) { + require_once( "$IP/StartProfiler.php" ); +} else { + require_once( "$IP/includes/ProfilerStub.php" ); +} wfProfileIn( 'WebStart.php-conf' ); # Load up some global defines. |