improvements in d* markdown conversion
This commit is contained in:
parent
c68235d10d
commit
9fc36d3da4
2
boot.php
2
boot.php
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1241' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1242' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||
define ( 'DB_UPDATE_VERSION', 1119 );
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue