aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-14 23:13:18 -0800
committerfriendica <info@friendica.com>2012-02-14 23:13:18 -0800
commit03171fd7deeb8e564478273ebdbee77eeab4a6cd (patch)
tree1eff806720631bcbaf0a119444c9fd1731d37b0b /include/text.php
parentf86593965389e2592ae41c7e7f5cb6dcfc7a660f (diff)
downloadvolse-hubzilla-03171fd7deeb8e564478273ebdbee77eeab4a6cd.tar.gz
volse-hubzilla-03171fd7deeb8e564478273ebdbee77eeab4a6cd.tar.bz2
volse-hubzilla-03171fd7deeb8e564478273ebdbee77eeab4a6cd.zip
preliminary qcomment support, [nosmile] tag to disable smiley processing
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;
}}