aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-28 16:21:36 -0800
committerfriendica <info@friendica.com>2014-01-28 16:21:36 -0800
commit22cbfdce1d8fe10296c5808759a02c96d3fbe48d (patch)
tree06bd52ec4da3bcf4370a28de4db7bfd86e48333f /include
parent8efac0cfd6db063a469ada1db4e5767a5fd975c6 (diff)
parent3cab53a7efbc58cdf1d81740cf00136c016e2863 (diff)
downloadvolse-hubzilla-22cbfdce1d8fe10296c5808759a02c96d3fbe48d.tar.gz
volse-hubzilla-22cbfdce1d8fe10296c5808759a02c96d3fbe48d.tar.bz2
volse-hubzilla-22cbfdce1d8fe10296c5808759a02c96d3fbe48d.zip
Merge pull request #287 from toclimb/testing
Don't look for text emoticons inside the matching angle brackets of a HTML tag
Diffstat (limited to 'include')
-rwxr-xr-xinclude/text.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index f5c440e4a..4cb7a1d5e 100755
--- a/include/text.php
+++ b/include/text.php
@@ -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;