X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSetup.php;h=afde02fa80716439efef1751e38e6c2d4d79de42;hb=5ce9371f3069f0e62e49619b4ae1113a64f2ea14;hp=01401ba5740fe52270ea44c561b60512998906fb;hpb=9e2e94da92750601a64e160fb5a1d8716064a104;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Setup.php b/includes/Setup.php
index 01401ba574..afde02fa80 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -41,6 +41,12 @@ if ( $wgArticlePath === false ) {
 	}
 }
 
+if ( !empty($wgActionPaths) && !isset($wgActionPaths['view']) ) {
+	# 'view' is assumed the default action path everywhere in the code
+	# but is rarely filled in $wgActionPaths
+	$wgActionPaths['view'] = $wgArticlePath;
+}
+
 if ( !empty($wgActionPaths) && !isset($wgActionPaths['view']) ) {
 	# 'view' is assumed the default action path everywhere in the code
 	# but is rarely filled in $wgActionPaths 
@@ -181,6 +187,11 @@ if ( $wgUseInstantCommons ) {
 	);
 }
 
+if ( is_null( $wgEnableAutoRotation ) ) {
+	// Only enable auto-rotation when the bitmap handler can rotate
+	$wgEnableAutoRotation = BitmapHandler::canRotate();
+}
+
 if ( $wgRCFilterByAge ) {
 	# # Trim down $wgRCLinkDays so that it only lists links which are valid
 	# # as determined by $wgRCMaxAge.
@@ -309,10 +320,12 @@ if ( $wgNewUserLog ) {
 	$wgLogTypes[]                        = 'newusers';
 	$wgLogNames['newusers']              = 'newuserlogpage';
 	$wgLogHeaders['newusers']            = 'newuserlogpagetext';
-	$wgLogActions['newusers/newusers']   = 'newuserlogentry'; // For compatibility with older log entries
-	$wgLogActions['newusers/create']     = 'newuserlog-create-entry';
-	$wgLogActions['newusers/create2']    = 'newuserlog-create2-entry';
-	$wgLogActions['newusers/autocreate'] = 'newuserlog-autocreate-entry';
+	# newusers, create, create2, autocreate
+	$wgLogActionsHandlers['newusers/*']  = 'NewUsersLogFormatter';
+}
+
+if ( $wgCookieSecure === 'detect' ) {
+	$wgCookieSecure = ( substr( $wgServer, 0, 6 ) === 'https:' );
 }
 
 if ( !defined( 'MW_COMPILED' ) ) {
@@ -321,19 +334,22 @@ if ( !defined( 'MW_COMPILED' ) ) {
 	}
 
 	wfProfileIn( $fname . '-exception' );
-	require_once( "$IP/includes/Exception.php" );
-	wfInstallExceptionHandler();
+	MWExceptionHandler::installHandler();
 	wfProfileOut( $fname . '-exception' );
 
 	wfProfileIn( $fname . '-includes' );
 	require_once( "$IP/includes/normal/UtfNormalUtil.php" );
 	require_once( "$IP/includes/GlobalFunctions.php" );
-	require_once( "$IP/includes/Hooks.php" );
 	require_once( "$IP/includes/ProxyTools.php" );
 	require_once( "$IP/includes/ImageFunctions.php" );
+	require_once( "$IP/includes/normal/UtfNormalDefines.php" );
 	wfProfileOut( $fname . '-includes' );
 }
-require_once( MWInit::compiledPath( 'includes/normal/UtfNormalDefines.php' ) );
+
+# Now that GlobalFunctions is loaded, set the default for $wgCanonicalServer
+if ( $wgCanonicalServer === false ) {
+	$wgCanonicalServer = wfExpandUrl( $wgServer, PROTO_HTTP );
+}
 
 wfProfileIn( $fname . '-misc1' );
 
@@ -353,17 +369,19 @@ if ( is_null( $wgLocaltimezone) ) {
 
 date_default_timezone_set( $wgLocaltimezone );
 if( is_null( $wgLocalTZoffset ) ) {
-	$wgLocalTZoffset = date('Z') / 60;
+	$wgLocalTZoffset = date( 'Z' ) / 60;
 }
 
-# Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
-$wgRequest = new WebRequest;
-
 # Useful debug output
 global $wgCommandLineMode;
 if ( $wgCommandLineMode ) {
+	$wgRequest = new FauxRequest( array() );
+
 	wfDebug( "\n\nStart command line script $self\n" );
 } else {
+	# Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
+	$wgRequest = new WebRequest;
+
 	$debug = "Start request\n\n{$_SERVER['REQUEST_METHOD']} {$wgRequest->getRequestURL()}";
 
 	if ( $wgDebugPrintHttpHeaders ) {
@@ -443,10 +461,15 @@ if ( !is_object( $wgAuth ) ) {
 
 # Placeholders in case of DB error
 $wgTitle = null;
-$wgArticle = null;
 
 $wgDeferredUpdateList = array();
 
+// We need to check for safe_mode, because mail() will throw an E_NOTICE
+// on additional parameters
+if( !is_null($wgAdditionalMailParams) && wfIniGetBool('safe_mode') ) {
+	$wgAdditionalMailParams = null;
+}
+
 wfProfileOut( $fname . '-globals' );
 wfProfileIn( $fname . '-extensions' );