diff options
| author | marijus <mario@localhost.localdomain> | 2014-01-30 00:08:40 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-01-30 00:08:40 +0100 |
| commit | a58239b9a8d8c35fa0e0b916617fa53d1014da58 (patch) | |
| tree | 4ebaf732d319efb80d9edebd941fb0be9e35cc06 /include/text.php | |
| parent | b39475db86eca7b5e5615d377d8adc64e6a33056 (diff) | |
| parent | fe2b6f3dfb4a9473905dde49b7741a6c03699c23 (diff) | |
| download | volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.gz volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.bz2 volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.zip | |
Merge branch 'upstream'
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; |