aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-11-22 10:17:18 +0100
committerMario <mario@mariovavti.com>2018-11-22 10:17:18 +0100
commit85f52d2aeda44072013b9af5bfd470fbf47c2769 (patch)
treec70da697b7aba9d3befeaf9330db6ef8a9619b2a /include/items.php
parente30be643c9f217dc379aac0feb085a1b1ffa44e1 (diff)
parentea235c0c6751b682332b968b4c18f905e8ece451 (diff)
downloadvolse-hubzilla-85f52d2aeda44072013b9af5bfd470fbf47c2769.tar.gz
volse-hubzilla-85f52d2aeda44072013b9af5bfd470fbf47c2769.tar.bz2
volse-hubzilla-85f52d2aeda44072013b9af5bfd470fbf47c2769.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php
index 8268d3fe7..5346a141b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2662,7 +2662,7 @@ function tag_deliver($uid, $item_id) {
if(preg_match_all($pluspattern,$body,$matches,PREG_SET_ORDER)) {
foreach($matches as $match) {
$matched_forums ++;
- if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_MENTION) {
+ if($term['url'] === $match[1] && intval($term['ttype']) === TERM_MENTION) {
if($matched_forums <= $max_forums) {
$plustagged = true;
$found = true;
@@ -2676,7 +2676,7 @@ function tag_deliver($uid, $item_id) {
if(preg_match_all($forumpattern,$body,$matches,PREG_SET_ORDER)) {
foreach($matches as $match) {
$matched_forums ++;
- if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_FORUM) {
+ if($term['url'] === $match[1] && intval($term['ttype']) === TERM_FORUM) {
if($matched_forums <= $max_forums) {
$plustagged = true;
$found = true;
@@ -2912,7 +2912,7 @@ function tgroup_check($uid, $item) {
if(preg_match_all($pluspattern,$body,$matches,PREG_SET_ORDER)) {
foreach($matches as $match) {
$matched_forums ++;
- if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_MENTION) {
+ if($term['url'] === $match[1] && intval($term['ttype']) === TERM_MENTION) {
if($matched_forums <= $max_forums) {
$found = true;
break;
@@ -2925,7 +2925,7 @@ function tgroup_check($uid, $item) {
if(preg_match_all($forumpattern,$body,$matches,PREG_SET_ORDER)) {
foreach($matches as $match) {
$matched_forums ++;
- if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_FORUM) {
+ if($term['url'] === $match[1] && intval($term['ttype']) === TERM_FORUM) {
if($matched_forums <= $max_forums) {
$found = true;
break;