X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=ffa01c73ee219420c761158f8d2507d8e127e254;hb=9d585dcc6d8010eb2c874c31e8b7e5d30cdc045a;hp=9053f8d195188d461708c333d56073f96bc59ea9;hpb=7f2f49ad2368ae27f2d4db69b44c5f997197725e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 9053f8d195..ffa01c73ee 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -494,7 +494,7 @@ abstract class Installer {
 
 		$good = true;
 		// Must go here because an old version of PCRE can prevent other checks from completing
-		list( $pcreVersion ) = explode( ' ', PCRE_VERSION, 2 );
+		$pcreVersion = explode( ' ', PCRE_VERSION, 2 )[0];
 		if ( version_compare( $pcreVersion, self::MINIMUM_PCRE_VERSION, '<' ) ) {
 			$this->showError( 'config-pcre-old', self::MINIMUM_PCRE_VERSION, $pcreVersion );
 			$good = false;
@@ -696,6 +696,7 @@ abstract class Installer {
 				'enableSectionEditLinks' => false,
 				'unwrap' => true,
 			] );
+			$html = Parser::stripOuterParagraph( $html );
 		} catch ( Wikimedia\Services\ServiceDisabledException $e ) {
 			$html = '<!--DB access attempted during parse-->  ' . htmlspecialchars( $text );
 		}
@@ -1203,9 +1204,11 @@ abstract class Installer {
 				}
 
 				try {
-					$text = Http::get( $url . $file, [ 'timeout' => 3 ], __METHOD__ );
+					$text = MediaWikiServices::getInstance()->getHttpRequestFactory()->
+						get( $url . $file, [ 'timeout' => 3 ], __METHOD__ );
 				} catch ( Exception $e ) {
-					// Http::get throws with allow_url_fopen = false and no curl extension.
+					// HttpRequestFactory::get can throw with allow_url_fopen = false and no curl
+					// extension.
 					$text = null;
 				}
 				unlink( $dir . $file );
@@ -1761,7 +1764,9 @@ abstract class Installer {
 	public static function overrideConfig() {
 		// Use PHP's built-in session handling, since MediaWiki's
 		// SessionHandler can't work before we have an object cache set up.
-		define( 'MW_NO_SESSION_HANDLER', 1 );
+		if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) {
+			define( 'MW_NO_SESSION_HANDLER', 1 );
+		}
 
 		// Don't access the database
 		$GLOBALS['wgUseDatabaseMessages'] = false;