no mention notifications from mastodon (and pleroma)

Zotlabs/Lib/PConfig.php

@@ -138,7 +138,7 @@ class PConfig {
 		$hash = hash('sha256',$family.':'.$key);
 
 		if (self::Get($uid, 'hz_delpconfig', $hash) !== false) {
-			if (Get($uid, 'hz_delpconfig', $hash) > $updated) {
+			if (self::Get($uid, 'hz_delpconfig', $hash) > $updated) {
 				logger('Refusing to update pconfig with outdated info (Item deleted more recently).', LOGGER_NORMAL, LOG_ERR);
 				return self::Get($uid,$family,$key);
 			} else {

include/items.php

@@ -2664,7 +2664,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;
@@ -2678,7 +2678,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;
@@ -2914,7 +2914,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;
@@ -2927,7 +2927,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;