From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Thu, 5 Feb 2015 17:11:14 +0000 (-0500)
Subject: API: paraminfo html strings shouldn't include unnecessary <p>s
X-Git-Tag: 1.31.0-rc.0~12236
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=50ee326c615ed38c16d7b5698c2a6a94061de06f;p=lhc%2Fweb%2Fwiklou.git

API: paraminfo html strings shouldn't include unnecessary <p>s

If the output is a single paragraph, there's not really a need for
explicit <p> tags around it.

Bug: T84995
Change-Id: I4406121fe0ec099c4a4ade849ef495edad90c2ad
---

diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index b74d52866f..f0a5daf0f0 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -156,7 +156,7 @@ class ApiParamInfo extends ApiBase {
 				if ( $joinLists ) {
 					$ret = preg_replace( '!\s*</([oud]l)>\s*<\1>\s*!', "\n", $ret );
 				}
-				$res[$key] = $ret;
+				$res[$key] = Parser::stripOuterParagraph( $ret );
 				break;
 
 			case 'raw':