translate D* images (markdown) before links, they overlap and conflict

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index ec41ce139e4f9321e65e83f5dcc15db640db24b5..92f492116f84b49c48325e597f90328febd665f7 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -16,8 +16,8 @@ function diaspora2bb($s) {
        $s = preg_replace("/\*(.+?)\*/", '[i]$1[/i]', $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 = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
        $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);