*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 d3d5b1f..578cdcf 100644 (file)
--- 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) ) {