Mercurial > defr > drupal > core
diff includes/mail.inc @ 7:fff6d4c8c043 6.3
Drupal 6.3
| author | Franck Deroche <webmaster@defr.org> |
|---|---|
| date | Tue, 23 Dec 2008 14:30:28 +0100 |
| parents | 2427550111ae |
| children | 589fb7c02327 |
line wrap: on
line diff
--- a/includes/mail.inc Tue Dec 23 14:30:08 2008 +0100 +++ b/includes/mail.inc Tue Dec 23 14:30:28 2008 +0100 @@ -1,5 +1,5 @@ <?php -// $Id: mail.inc,v 1.8.2.2 2008/04/02 08:41:30 goba Exp $ +// $Id: mail.inc,v 1.8.2.3 2008/05/19 08:19:00 goba Exp $ /** * Compose and optionally send an e-mail message. @@ -272,8 +272,8 @@ $string = _filter_htmlcorrector(filter_xss($string, $allowed_tags)); // Apply inline styles. - $string = preg_replace('!</?(em|i)>!i', '/', $string); - $string = preg_replace('!</?(strong|b)>!i', '*', $string); + $string = preg_replace('!</?(em|i)((?> +)[^>]*)?>!i', '/', $string); + $string = preg_replace('!</?(strong|b)((?> +)[^>]*)?>!i', '*', $string); // Replace inline <a> tags with the text of link and a footnote. // 'See <a href="http://drupal.org">the Drupal site</a>' becomes