From: C. Scott Ananian <cscott@cscott.net>
Date: Thu, 27 Sep 2018 15:44:15 +0000 (-0400)
Subject: Use <div> wrappers instead of <p> in ProtectionForm
X-Git-Tag: 1.34.0-rc.0~3851^2
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=e8a53ecf368c3c6611c349ad755b9dfca8307062;p=lhc%2Fweb%2Fwiklou.git

Use <div> wrappers instead of <p> in ProtectionForm

<p>-wrappers are fragile in case the wrapped content contains `<div>`,
`<p>` (or wikitext double newlines).  Use <div> wrappers consistently
in MediaWiki.

Bug: T205624
Change-Id: Ieee77f4220c7895ac5dccb2b638baef0dc22c84f
---

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 1f3de501f8..eacd370afd 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -204,9 +204,9 @@ class ProtectionForm {
 		$out->addBacklinkSubtitle( $this->mTitle );
 
 		if ( is_array( $err ) ) {
-			$out->wrapWikiMsg( "<p class='error'>\n$1\n</p>\n", $err );
+			$out->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n", $err );
 		} elseif ( is_string( $err ) ) {
-			$out->addHTML( "<p class='error'>{$err}</p>\n" );
+			$out->addHTML( "<div class='error'>{$err}</div>\n" );
 		}
 
 		if ( $this->mTitle->getRestrictionTypes() === [] ) {