diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-16 22:32:17 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-04-16 22:32:17 +0000 |
| commit | 126eb0979f6518ce502f4bc449ea4a58aa93f978 (patch) | |
| tree | 298dddc0293e5a16f04846d83150cc5f1dced9ca /phpBB/includes/bbcode.php | |
| parent | b93bb3d90c3ffb3bdde6d1b931eaf826089e772b (diff) | |
| download | forums-126eb0979f6518ce502f4bc449ea4a58aa93f978.tar forums-126eb0979f6518ce502f4bc449ea4a58aa93f978.tar.gz forums-126eb0979f6518ce502f4bc449ea4a58aa93f978.tar.bz2 forums-126eb0979f6518ce502f4bc449ea4a58aa93f978.tar.xz forums-126eb0979f6518ce502f4bc449ea4a58aa93f978.zip | |
Added some extra 's' extensions to preg_matches to cope with multiline data
git-svn-id: file:///svn/phpbb/trunk@3861 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 47106edb09..a78ad84e83 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -60,6 +60,7 @@ class bbcode { ${$type}['search'][] = str_replace('$uid', $this->bbcode_uid, $search); ${$type}['replace'][] = $replace; + } } } @@ -192,21 +193,21 @@ class bbcode case 4: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( - '#\[img:$uid\](.*?)\[/img:$uid\]#' => '<img src="\1" border="0" />' + '#\[img:$uid\](.*?)\[/img:$uid\]#s' => '<img src="\1" border="0" />' ) ); break; case 5: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( - '#\[size=(.*?):$uid\](.*?)\[/size:$uid\]#' => '<span style="font-size: \1px; line-height: normal">\2</span>' + '#\[size=(.*?):$uid\](.*?)\[/size:$uid\]#s' => '<span style="font-size: \1px; line-height: normal">\2</span>' ) ); break; case 6: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( - '#\[color=(.*?):$uid\](.*?)\[/color:$uid\]#' => '<span style="color: \1">\2</span>' + '#\[color=(.*?):$uid\](.*?)\[/color:$uid\]#s' => '<span style="color: \1">\2</span>' ) ); break; @@ -241,7 +242,7 @@ class bbcode case 10: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( - '#\[email:$uid\](.*?)\[/email:$uid\]#i' => '<a href="mailto:\1">\1</a>', + '#\[email:$uid\](.*?)\[/email:$uid\]#is' => '<a href="mailto:\1">\1</a>', '#\[email=(.*?):$uid\](.*?)\[/email:$uid\]#is' => '<a href="mailto:\1">\2</a>' ) ); |