harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup bb2diaspora - was getting crufty

Browse Source
This commit is contained in:
friendica 2014-12-23 14:18:27 -08:00
parent 8db34ac826
commit b171ea23e4
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/bb2diaspora.php
View File

@ -121,18 +121,6 @@ function diaspora2bb($s,$use_zrl = false) {
$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
// Too many new lines. So deactivated the following line
// $s = str_replace("\r","\n",$s);
// Simply remove cr.
// $s = str_replace("\r","",$s);
// <br/> is invalid. Replace it with the valid expression
// $s = str_replace("<br/>","<br />",$s);
// $s = str_replace("\n","<br />",$s);
// $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
// first try plustags
$s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}\+/','diaspora_mention_callback',$s);
@ -144,18 +132,13 @@ function diaspora2bb($s,$use_zrl = false) {
// This seems to work
$s = preg_replace('/\#([^\s\#])/','&#35;$1',$s);
$s = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$s);
$s = Markdown($s);
$s = str_replace("\r","",$s);
$s = str_replace('&#35;','#',$s);
// we seem to have double linebreaks
// $s = str_replace("\n",'<br />',$s);
$s = html2bbcode($s);
// $s = str_replace('&#42;','*',$s);
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
$s = str_replace('&#x2672;',html_entity_decode('&#x2672;',ENT_QUOTES,'UTF-8'),$s);
@ -178,9 +161,6 @@ function diaspora2bb($s,$use_zrl = false) {
// remove duplicate adjacent code tags
$s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
$s = preg_replace_callback('/\[share(.*?)\]/ism','share_unshield',$s);
// Don't show link to full picture (until it is fixed)
$s = scale_external_images($s, false);

2
version.inc
View File

@ -1 +1 @@
2014-12-22.897
2014-12-23.898