X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FNoLocalSettings.php;h=50950ef30031556e393fedff5f5f8a7fada46c0c;hb=5df9a27b27c67e196f5eff48d86615735ec9378c;hp=6de9bfcde0212356a4fb4daf5f5a733d4717f193;hpb=badc035712ded02e8ec7ee4c5e8a0fe09e2811d2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/NoLocalSettings.php b/includes/NoLocalSettings.php
index 6de9bfcde0..50950ef300 100644
--- a/includes/NoLocalSettings.php
+++ b/includes/NoLocalSettings.php
@@ -20,8 +20,8 @@
  * @file
  */
 
-# bug 30219 : can not use pathinfo() on URLs since slashes do not match
-$matches = array();
+# T32219 : can not use pathinfo() on URLs since slashes do not match
+$matches = [];
 $ext = 'php';
 $path = '/';
 foreach ( array_filter( explode( '/', $_SERVER['PHP_SELF'] ) ) as $part ) {
@@ -37,7 +37,9 @@ foreach ( array_filter( explode( '/', $_SERVER['PHP_SELF'] ) ) as $part ) {
 if ( !function_exists( 'session_name' ) ) {
 	$installerStarted = false;
 } else {
-	session_name( 'mw_installer_session' );
+	if ( !wfIniGetBool( 'session.auto_start' ) ) {
+		session_name( 'mw_installer_session' );
+	}
 	$oldReporting = error_reporting( E_ALL & ~E_NOTICE );
 	$success = session_start();
 	error_reporting( $oldReporting );
@@ -50,13 +52,13 @@ $templateParser = new TemplateParser();
 try {
 	echo $templateParser->processTemplate(
 		'NoLocalSettings',
-		array(
+		[
 			'wgVersion' => ( isset( $wgVersion ) ? $wgVersion : 'VERSION' ),
 			'path' => $path,
 			'ext' => $ext,
 			'localSettingsExists' => file_exists( MW_CONFIG_FILE ),
 			'installerStarted' => $installerStarted
-		)
+		]
 	);
 } catch ( Exception $e ) {
 	echo 'Error: ' . htmlspecialchars( $e->getMessage() );