From: friendica <info@friendica.com>
Date: Mon, 19 Mar 2012 10:18:39 +0000 (-0700)
Subject: support "no_smilies"
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2349852b4abd1638624b541f173f51d1fb1ea011;p=friendica.git

support "no_smilies"
---

diff --git a/include/text.php b/include/text.php
index 89acbf9fab..a0ff1600ed 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);