aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-30 20:20:17 -0700
committerFriendika <info@friendika.com>2011-08-30 20:20:17 -0700
commitb11a0efff120508a2059afe372f50144dcc8b977 (patch)
tree1746f87c4e720058c6276175d3c28822a004037d /include/bb2diaspora.php
parentf0a4a6af619b2d9b2fca217c24667f8eea429b62 (diff)
downloadvolse-hubzilla-b11a0efff120508a2059afe372f50144dcc8b977.tar.gz
volse-hubzilla-b11a0efff120508a2059afe372f50144dcc8b977.tar.bz2
volse-hubzilla-b11a0efff120508a2059afe372f50144dcc8b977.zip
This *might* fix Diaspora @ tags - or it might not.
Diffstat (limited to 'include/bb2diaspora.php')
-rw-r--r--include/bb2diaspora.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 066d7bfff..ec41ce139 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -18,6 +18,8 @@ function diaspora2bb($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 = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
+
$s = escape_tags($s);
return $s;