harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix url mismatches of a single trailing slash for feed author/owner comparisons; update diaspora_compat

Browse Source
This commit is contained in:
friendica
2014-09-23 20:55:22 -07:00
parent 02210b81d8
commit 81ee35e03b
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/bb2diaspora.php
View File

@@ -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);