Don't look for text emoticons inside the matching angle brackets of a HTML tag

This commit is contained in:
toclimb 2014-01-29 00:43:54 +01:00
parent f104b4dc27
commit 3cab53a7ef

View File

@ -891,6 +891,7 @@ function smilies($s, $sample = false) {
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
$s = preg_replace_callback('/<(.*?)>/s','smile_encode',$s);
$texts = array(
'&lt;3',
@ -983,6 +984,7 @@ function smilies($s, $sample = false) {
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_decode',$s);
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_decode',$s);
$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
return $s;