X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FMessage.php;h=7d05f41e86cda77ce6203dec1b447e042ec92620;hb=fe73f41ca9ec548a250b1fd41bf54363d1e1e585;hp=e55eaaf646f399ec5e665c7382b517206f5b4019;hpb=e27cf1f7ef3e09d0ca7f97bee9c046e13abe35f6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Message.php b/includes/Message.php
index e55eaaf646..7d05f41e86 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1105,7 +1105,7 @@ class Message implements MessageSpecifier, Serializable {
 	public static function listParam( array $list, $type = 'text' ) {
 		if ( !isset( self::$listTypeMap[$type] ) ) {
 			throw new InvalidArgumentException(
-				"Invalid type '$type'. Known types are: " . join( ', ', array_keys( self::$listTypeMap ) )
+				"Invalid type '$type'. Known types are: " . implode( ', ', array_keys( self::$listTypeMap ) )
 			);
 		}
 		return [ 'list' => $list, 'type' => $type ];
@@ -1245,7 +1245,14 @@ class Message implements MessageSpecifier, Serializable {
 		);
 
 		return $out instanceof ParserOutput
-			? $out->getText( [ 'enableSectionEditLinks' => false ] )
+			? $out->getText( [
+				'enableSectionEditLinks' => false,
+				// Wrapping messages in an extra <div> is probably not expected. If
+				// they're outside the content area they probably shouldn't be
+				// targeted by CSS that's targeting the parser output, and if
+				// they're inside they already are from the outer div.
+				'unwrap' => true,
+			] )
 			: $out;
 	}