aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.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/bb2diaspora.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/bb2diaspora.php')
-rwxr-xr-xinclude/bb2diaspora.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 9a29b05a2..c26b0c334 100755
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -212,7 +212,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text);
-
+ $Text = str_replace('[nosmile]','',$Text);
// oembed tag
// $Text = oembed_bbcode2html($Text);