diff options
| author | Thomas Willingham <founder@kakste.com> | 2014-05-22 19:39:28 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2014-05-22 19:39:28 +0100 |
| commit | 292601728430469f21b81d7055cd485a0efb491c (patch) | |
| tree | 4d35371f101a26b69eb8dc6dc15c3be4a884258e /include/items.php | |
| parent | b06fd69da84626c1e8c1d8b5dbda6f181027a782 (diff) | |
| parent | 8e2771cbd409d56917e7d249d80a2c422609f540 (diff) | |
| download | volse-hubzilla-292601728430469f21b81d7055cd485a0efb491c.tar.gz volse-hubzilla-292601728430469f21b81d7055cd485a0efb491c.tar.bz2 volse-hubzilla-292601728430469f21b81d7055cd485a0efb491c.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index 5aaeb55c0..1c44b7df5 100755 --- a/include/items.php +++ b/include/items.php @@ -2438,7 +2438,7 @@ function tag_deliver($uid,$item_id) { if($terms) { foreach($terms as $term) { - if((strcasecmp($term['term'],$u[0]['channel_name']) == 0) && link_compare($term['url'],$link)) { + if(link_compare($term['url'],$link)) { $mention = true; break; } @@ -2474,11 +2474,11 @@ function tag_deliver($uid,$item_id) { $tagged = false; $plustagged = false; - $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'],'/') . '\[\/zrl\]/'; if(preg_match($pattern,$body,$matches)) $tagged = true; - $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'] . '+','/') . '\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/'; if(preg_match($pattern,$body,$matches)) $plustagged = true; @@ -2607,7 +2607,7 @@ function tgroup_check($uid,$item) { if($terms) { foreach($terms as $term) { - if(($term['term'] == $u[0]['channel_name']) && link_compare($term['url'],$link)) { + if(link_compare($term['url'],$link)) { $mention = true; break; } @@ -2625,7 +2625,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($term['term'] . '+','/') . '\[\/zrl\]/'; if(! preg_match($pattern,$body,$matches)) { logger('tgroup_check: mention was in a reshare - ignoring'); |