From ef22c1a9b3d4c452144bce7b94f31050622e17d6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Oct 2012 18:04:12 +1100 Subject: prevent tag recursion on shared posts --- include/items.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index d755b7050..4b16e48fb 100755 --- a/include/items.php +++ b/include/items.php @@ -1228,7 +1228,9 @@ function tag_deliver($uid,$item_id) { $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $body = preg_replace("/\[share\](.*?)\[\/share\]/ism", '', $item['body']); + + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { if(link_compare($link,$mtch[1])) { @@ -1344,7 +1346,9 @@ function tgroup_check($uid,$item) { $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $body = preg_replace("/\[share\](.*?)\[\/share\]/ism", '', $item['body']); + + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { -- cgit v1.2.3