From: Brian Wolff <bawolff+wn@gmail.com>
Date: Mon, 8 Apr 2019 02:24:57 +0000 (+0000)
Subject: Make Installer::parse not be parseAsBlock
X-Git-Tag: 1.31.5~1
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=953cf998e3ef64972970b287bb8ec899191508e1

Make Installer::parse not be parseAsBlock

Previously all the checkboxes had newlines before their labels
which looked really broken.

Change-Id: I5e17524d90d10867ed27553a90cfb246984486d3
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 10cc2e6497..2a4ac43d41 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -3,6 +3,7 @@
 THIS IS NOT A RELEASE YET
 
 === Changes since MediaWiki 1.31.4 ===
+* Fix extra newlines in installer.
 * Followup T230402, PermissionManager doesn't exist until 1.33, so fix the
   backported patches to use User::isAllowed() instead.
 
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index abf4de4f69..f4512e47d3 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -697,6 +697,7 @@ abstract class Installer {
 				'enableSectionEditLinks' => false,
 				'unwrap' => true,
 			] );
+			$html = Parser::stripOuterParagraph( $html );
 		} catch ( MediaWiki\Services\ServiceDisabledException $e ) {
 			$html = '<!--DB access attempted during parse-->  ' . htmlspecialchars( $text );
 		}