aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/text.php')
-rwxr-xr-xinclude/text.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index 082d907ff..0cd7f114e 100755
--- a/include/text.php
+++ b/include/text.php
@@ -878,7 +878,10 @@ function prepare_text($text) {
require_once('include/bbcode.php');
- $s = smilies(bbcode($text));
+ if(stristr($text,'[nosmile]'))
+ $s = bbcode($text);
+ else
+ $s = smilies(bbcode($text));
return $s;
}}