aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-30 18:46:34 -0700
committerFriendika <info@friendika.com>2011-08-30 18:46:34 -0700
commitf8da48a880f8b01e2284610e74fe3b2b6ec2dc39 (patch)
tree12168072ceb9bfd533b60564310bbfb73fdf2d0d /include/bb2diaspora.php
parent0f1bc6e9571e367b37246e43ce08921bf317fa7c (diff)
downloadvolse-hubzilla-f8da48a880f8b01e2284610e74fe3b2b6ec2dc39.tar.gz
volse-hubzilla-f8da48a880f8b01e2284610e74fe3b2b6ec2dc39.tar.bz2
volse-hubzilla-f8da48a880f8b01e2284610e74fe3b2b6ec2dc39.zip
unsafe chars in admin, add img to diaspora markdown processor
Diffstat (limited to 'include/bb2diaspora.php')
-rw-r--r--include/bb2diaspora.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 7f7b8748d..066d7bfff 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -17,6 +17,7 @@ function diaspora2bb($s) {
$s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
$s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
$s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
+ $s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
$s = escape_tags($s);
return $s;