Merge "Http::getProxy() method to get proxy configuration"

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

diff --git a/includes/WebStart.php b/includes/WebStart.php
index c5e7457..29ad456 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -26,31 +26,11 @@
  * @file
  */
 
-# Die if register_globals is enabled (PHP <=5.3)
-# This must be done before any globals are set by the code
-if ( ini_get( 'register_globals' ) ) {
-       die( 'MediaWiki does not support installations where register_globals is enabled. Please see '
-               . '<a href="https://www.mediawiki.org/wiki/register_globals">mediawiki.org</a> '
-               . 'for help on how to disable it.' );
-}
-
-if ( function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() ) {
-       die( 'MediaWiki does not function when magic quotes are enabled. Please see the '
-               . '<a href="https://php.net/manual/security.magicquotes.disabling.php">PHP Manual</a> '
-               . 'for help on how to disable magic quotes.' );
-}
-
-
 # bug 15461: Make IE8 turn off content sniffing. Everybody else should ignore this
 # We're adding it here so that it's *always* set, even for alternate entry
 # points and when $wgOut gets disabled or overridden.
 header( 'X-Content-Type-Options: nosniff' );
 
-# Approximate $_SERVER['REQUEST_TIME_FLOAT'] for PHP<5.4
-if ( !isset( $_SERVER['REQUEST_TIME_FLOAT'] ) ) {
-       $_SERVER['REQUEST_TIME_FLOAT'] = microtime( true );
-}
-
 /**
  * @var float Request start time as fractional seconds since epoch
  * @deprecated since 1.25; use $_SERVER['REQUEST_TIME_FLOAT'] or
@@ -86,12 +66,11 @@ require_once "$IP/includes/AutoLoader.php";
 require_once "$IP/includes/Defines.php";
 
 # Start the profiler
-$wgProfiler = array();
+$wgProfiler = [];
 if ( file_exists( "$IP/StartProfiler.php" ) ) {
        require "$IP/StartProfiler.php";
 }
 
-
 # Load default settings
 require_once "$IP/includes/DefaultSettings.php";
 
@@ -141,7 +120,6 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        require_once MW_CONFIG_FILE;
 }
 
-
 # Initialise output buffering
 # Check that there is no previous output or previously set up buffers, because
 # that would cause us to potentially mix gzip and non-gzip output, creating a