diff options
| author | Michael Meer <michael@meer.name> | 2014-01-29 14:07:25 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-29 14:07:25 +0100 |
| commit | ac8d481a3223335050a7f8dfe1c893a0b301ae7b (patch) | |
| tree | c5461820ba181db4258bcf524c42f3fac982e454 /include/text.php | |
| parent | aa285b83c1c8f674be8f200d4feae6299eafc436 (diff) | |
| parent | a1e7c65d51a6472cf7fe95686883f77953d7dfd7 (diff) | |
| download | volse-hubzilla-ac8d481a3223335050a7f8dfe1c893a0b301ae7b.tar.gz volse-hubzilla-ac8d481a3223335050a7f8dfe1c893a0b301ae7b.tar.bz2 volse-hubzilla-ac8d481a3223335050a7f8dfe1c893a0b301ae7b.zip | |
Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php index f5c440e4a..a459296cb 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('/<(.*?)>/ism','smile_encode',$s); $texts = array( '<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; |