diff options
| author | zottel <github@zottel.net> | 2012-03-19 12:32:07 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-19 12:32:07 +0100 |
| commit | 2b3b97df0981c271584c75f43811ca07eb32bafe (patch) | |
| tree | 817dad1559f2b40d8bd082e86af1d8be83ba6ed6 /include/text.php | |
| parent | 6d31e3d6ef56e22ecedccaeb6846b52da501097b (diff) | |
| parent | 2349852b4abd1638624b541f173f51d1fb1ea011 (diff) | |
| download | volse-hubzilla-2b3b97df0981c271584c75f43811ca07eb32bafe.tar.gz volse-hubzilla-2b3b97df0981c271584c75f43811ca07eb32bafe.tar.bz2 volse-hubzilla-2b3b97df0981c271584c75f43811ca07eb32bafe.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php index 89acbf9fa..a0ff1600e 100644 --- a/include/text.php +++ b/include/text.php @@ -694,8 +694,13 @@ function linkify($s) { if(! function_exists('smilies')) { function smilies($s, $sample = false) { + $a = get_app(); + if(intval(get_config('system','no_smilies')) + || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) + return $s; + $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s); $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s); |