This *might* fix Diaspora @ tags - or it might not.

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 066d7bfffee5e8635d7726bb58f7f19a1bf4d05a..ec41ce139e4f9321e65e83f5dcc15db640db24b5 100644 (file)
--- 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;