From: Friendika <info@friendika.com>
Date: Wed, 31 Aug 2011 06:24:45 +0000 (-0700)
Subject: translate D* images (markdown) before links, they overlap and conflict
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c60d45752db65a10b491f3a69ab63dc202f61533;p=friendica.git

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

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index ec41ce139e..92f492116f 100644
--- 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);