From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 28 May 2007 04:23:59 +0000 (+0000)
Subject: *use /s modifier for parseinline regexp, <p> tags were being left on some messages
X-Git-Tag: 1.31.0-rc.0~52790
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=ee56b467dfe6305189423a7afbc159f1acb25174;p=lhc%2Fweb%2Fwiklou.git

*use /s modifier for parseinline regexp, <p> tags were being left on some messages
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d3d5b1fee1..578cdcf1c4 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -592,7 +592,7 @@ function wfMsgExt( $key, $options ) {
 	} elseif ( in_array('parseinline', $options) ) {
 		$string = $wgOut->parse( $string, true, true );
 		$m = array();
-		if( preg_match( "~^<p>(.*)\n?</p>$~", $string, $m ) ) {
+		if( preg_match( '/^<p>(.*)\n?<\/p>$/s', $string, $m ) ) {
 			$string = $m[1];
 		}
 	} elseif ( in_array('parsemag', $options) ) {