diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-25 08:44:07 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-25 08:44:07 +0200 |
| commit | 6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1 (patch) | |
| tree | 89e81409add34df97f633515181790d6aed4c726 /include/bb2diaspora.php | |
| parent | 7da97c198182f8f6f4286e16d80de205431d81bb (diff) | |
| parent | 92c723d37cd8ded2183d3334eb51e740170e191b (diff) | |
| download | volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.tar.gz volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.tar.bz2 volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.zip | |
Rebase from upstream
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index e60f72add..089838e97 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -131,10 +131,8 @@ function diaspora2bb($s,$use_zrl = false) { // $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); // first try plustags - // nope don't do it. This will cause mis-attributed messages and runaway delivery chains - - // Diaspora doesn't have sufficient delivery loop detection. - // Leave the next line commented and leave this description here so future readers will know why. - // $s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}\+/','diaspora_mention_callback',$s); + + $s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}\+/','diaspora_mention_callback',$s); $s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}/','diaspora_mention_callback',$s); |