support "no_smilies"

diff --git a/include/text.php b/include/text.php
index 89acbf9fabc3d2acc4376f2100c0a53f0c6cd1da..a0ff1600ed4bcb4a9c961e50c83b4324e831c55b 100644 (file)
--- 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);