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
This commit is contained in:
Paul S. Owen 2003-04-16 22:32:17 +00:00
parent b93bb3d90c
commit 126eb0979f

View file

@ -60,6 +60,7 @@ class bbcode
{ {
${$type}['search'][] = str_replace('$uid', $this->bbcode_uid, $search); ${$type}['search'][] = str_replace('$uid', $this->bbcode_uid, $search);
${$type}['replace'][] = $replace; ${$type}['replace'][] = $replace;
} }
} }
} }
@ -192,21 +193,21 @@ class bbcode
case 4: case 4:
$this->bbcode_cache[$bbcode_id] = array( $this->bbcode_cache[$bbcode_id] = array(
'preg' => array( 'preg' => array(
'#\[img:$uid\](.*?)\[/img:$uid\]#' => '<img src="\1" border="0" />' '#\[img:$uid\](.*?)\[/img:$uid\]#s' => '<img src="\1" border="0" />'
) )
); );
break; break;
case 5: case 5:
$this->bbcode_cache[$bbcode_id] = array( $this->bbcode_cache[$bbcode_id] = array(
'preg' => 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; break;
case 6: case 6:
$this->bbcode_cache[$bbcode_id] = array( $this->bbcode_cache[$bbcode_id] = array(
'preg' => 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; break;
@ -241,7 +242,7 @@ class bbcode
case 10: case 10:
$this->bbcode_cache[$bbcode_id] = array( $this->bbcode_cache[$bbcode_id] = array(
'preg' => 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>' '#\[email=(.*?):$uid\](.*?)\[/email:$uid\]#is' => '<a href="mailto:\1">\2</a>'
) )
); );