aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-29 19:45:54 -0800
committerfriendica <info@friendica.com>2013-12-29 19:45:54 -0800
commita331e1acde66a409bc26562e81ba9155e077b457 (patch)
tree9e80800b2d3c90a05ca34f55e4e54febc9d201ca
parent3f110567a1cf82b1bcf324cfe15e53460fb5dd04 (diff)
downloadvolse-hubzilla-a331e1acde66a409bc26562e81ba9155e077b457.tar.gz
volse-hubzilla-a331e1acde66a409bc26562e81ba9155e077b457.tar.bz2
volse-hubzilla-a331e1acde66a409bc26562e81ba9155e077b457.zip
modify tag_deliver and tgroup_check to handle exclusion tags
-rwxr-xr-xinclude/items.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 465fda543..9824d2434 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2284,7 +2284,7 @@ function tag_deliver($uid,$item_id) {
$body = preg_replace('/\[share(.*?)\[\/share\]/','',$body);
- $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/';
+ $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/';
if(! preg_match($pattern,$body,$matches)) {
logger('tag_deliver: mention was in a reshare - ignoring');
@@ -2418,7 +2418,7 @@ function tgroup_check($uid,$item) {
$body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']);
- $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/';
+ $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/';
if(! preg_match($pattern,$body,$matches)) {
logger('tgroup_check: mention was in a reshare - ignoring');