Imported mails were deleted the second time the poller ran - when moving or deleting...

[friendica.git] / include / bb2diaspora.php

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 75fe1ef35dd02d7b5aa33d824927faba7811d2fb..ffe6b3b970bd5dbc4137ac8a98e280a6867e9540 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -155,6 +155,9 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
        //      $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
        //                              "[url]$1[/url]\n[img]$2[/img]", $Text);
 
+       // Remove the avatar picture since that isn't looking good on the other side
+       //$Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);
+
        // Convert it to HTML - don't try oembed
        $Text = bbcode($Text, $preserve_nl, false);