harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #287 from toclimb/testing

Browse Source 
Don't look for text emoticons inside the matching angle brackets of a HTML tag
This commit is contained in:
friendica 2014-01-28 16:21:36 -08:00
commit 22cbfdce1d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/text.php
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;