diff options
| author | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-09-28 23:17:47 +0200 |
|---|---|---|
| committer | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-09-28 23:17:47 +0200 |
| commit | f104dc840c79f4ea666a85033bffbf4a33d06f4e (patch) | |
| tree | f1fce3898b757e3a29e928cc1afe724edb620471 /include/bb2diaspora.php | |
| parent | 6e141a8a53ba6cb7d91b989985744fdcd3d6f13d (diff) | |
| parent | eaf96f987a5f22a54fdbb4cedef52b0159a37ad0 (diff) | |
| download | volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.tar.gz volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.tar.bz2 volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.zip | |
Merge from origin
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); |