diff options
author | friendica <info@friendica.com> | 2012-02-01 17:09:53 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-02-01 17:09:53 -0800 |
commit | 9fc36d3da4e85b4b25b7abe1917cb2188eea77ea (patch) | |
tree | 01d388a4e605a5d04790e4f9a8cb63d8fa6766ac /include/bb2diaspora.php | |
parent | c68235d10da7edf030390c21f03af240ffa49252 (diff) | |
download | volse-hubzilla-9fc36d3da4e85b4b25b7abe1917cb2188eea77ea.tar.gz volse-hubzilla-9fc36d3da4e85b4b25b7abe1917cb2188eea77ea.tar.bz2 volse-hubzilla-9fc36d3da4e85b4b25b7abe1917cb2188eea77ea.zip |
improvements in d* markdown conversion
Diffstat (limited to 'include/bb2diaspora.php')
-rwxr-xr-x | include/bb2diaspora.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index d367b6716..9a29b05a2 100755 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -14,9 +14,17 @@ require_once('include/html2bbcode.php'); function diaspora2bb($s) { $s = html_entity_decode($s,ENT_COMPAT,'UTF-8'); + $s = str_replace("\r","\n",$s); $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); + + $s = preg_replace('/\#([^\s\#])/','\\#$1',$s); + $s = Markdown($s); + + $s = str_replace('#','#',$s); + $s = str_replace("\n",'<br />',$s); + $s = html2bbcode($s); // $s = str_replace('*','*',$s); @@ -30,11 +38,6 @@ function diaspora2bb($s) { $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s); $s = scale_diaspora_images($s); - // we seem to get a lot of text smushed together with links from Diaspora. - - $s = preg_replace('/[^ ]\[url\=(.*?)\]/',' [url=$1]' ,$s); - $s = preg_replace('/\[\/url\][^ ]/','[/url] ',$s); - return $s; } |