diff options
| author | friendica <info@friendica.com> | 2014-09-23 20:55:22 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-23 20:55:22 -0700 |
| commit | 81ee35e03bc45bc80aaabb9416bdee2968b8f504 (patch) | |
| tree | 2382e7fc62713b5a9828a25aeccac15d40852165 /include/bb2diaspora.php | |
| parent | 02210b81d8c68db354ef3e33b903fb9d1605df7e (diff) | |
| download | volse-hubzilla-81ee35e03bc45bc80aaabb9416bdee2968b8f504.tar.gz volse-hubzilla-81ee35e03bc45bc80aaabb9416bdee2968b8f504.tar.bz2 volse-hubzilla-81ee35e03bc45bc80aaabb9416bdee2968b8f504.zip | |
fix url mismatches of a single trailing slash for feed author/owner comparisons; update diaspora_compat
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); |