aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-23 14:18:27 -0800
committerfriendica <info@friendica.com>2014-12-23 14:18:27 -0800
commitb171ea23e4d49a2d4e88278591619d72e3904ccd (patch)
tree69914c84e93e88459bb4f355047e7a48e7d1ba4d /include
parent8db34ac8264d066b644ab579401f00ed3cc4cc62 (diff)
downloadvolse-hubzilla-b171ea23e4d49a2d4e88278591619d72e3904ccd.tar.gz
volse-hubzilla-b171ea23e4d49a2d4e88278591619d72e3904ccd.tar.bz2
volse-hubzilla-b171ea23e4d49a2d4e88278591619d72e3904ccd.zip
cleanup bb2diaspora - was getting crufty
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php20
1 files changed, 0 insertions, 20 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 49dee8759..5c93ac3aa 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -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);