Changeset 2358 for trunk/system/helpers/text.php

Timestamp:

03/27/2008 05:22:57 AM (8 months ago)

Author:

Geert

Message:

Fixed bug in text::auto_p() that would not remove <p> tags around $no_p html blocks that are surrounded by spaces.

Files:

• trunk/system/helpers/text.php (modified) (2 diffs)

trunk/system/helpers/text.php

@@ -222 +222 @@
         public static function auto_link($text)
         {
+                // Auto link emails first to prevent problems with "www.domain.com@example.com"
                 return text::auto_link_urls(text::auto_link_emails($text));
         }
@@ -303 +304 @@
                 // Some html elements should not be surrounded by <p> tags
                 $no_p = '(?:p|div|h[1-6r]|[uod]l|pre|blockquote|table|form|style)';
-                $str = preg_replace('~<p>(?=<'.$no_p.'[^>]*+>)~i', '', $str);
-                return preg_replace('~(</'.$no_p.'>)</p>~i', '$1', $str);
+                $str = preg_replace('~<p>(?=\s*+<'.$no_p.'[^>]*+>)~i', '', $str);
+                return preg_replace('~(</'.$no_p.'>\s*+)</p>~i', '$1', $str);
         }