r22496 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r22495‎ | r22496 | r22497 >
Date:04:23, 28 May 2007
Author:aaron
Status:old
Tags:
Comment:
*use /s modifier for parseinline regexp, <p> tags were being left on some messages
Modified paths:
  • /trunk/phase3/includes/GlobalFunctions.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/GlobalFunctions.php
@@ -592,7 +592,7 @@
593593 } elseif ( in_array('parseinline', $options) ) {
594594 $string = $wgOut->parse( $string, true, true );
595595 $m = array();
596 - if( preg_match( "~^<p>(.*)\n?</p>$~", $string, $m ) ) {
 596+ if( preg_match( '/^<p>(.*)\n?<\/p>$/s', $string, $m ) ) {
597597 $string = $m[1];
598598 }
599599 } elseif ( in_array('parsemag', $options) ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r22518Merged revisions 22484-22517 via svnmerge from...david22:22, 28 May 2007