diff options
| author | Friendika <info@friendika.com> | 2011-08-30 23:24:45 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-30 23:24:45 -0700 |
| commit | c60d45752db65a10b491f3a69ab63dc202f61533 (patch) | |
| tree | 9c83953977f6cd7f5a5ee4b0ea73732db05a7a27 /include/bb2diaspora.php | |
| parent | f0c3a75ff38dcd208710fa24596c34290faf110e (diff) | |
| download | volse-hubzilla-c60d45752db65a10b491f3a69ab63dc202f61533.tar.gz volse-hubzilla-c60d45752db65a10b491f3a69ab63dc202f61533.tar.bz2 volse-hubzilla-c60d45752db65a10b491f3a69ab63dc202f61533.zip | |
translate D* images (markdown) before links, they overlap and conflict
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index ec41ce139..92f492116 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); |