Merge branch 'master' into z6

1 files changed, 8 insertions, 5 deletions

diff --git a/include/items.php b/include/items.php
index d0b9cffc9..c7206458e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -390,7 +390,7 @@ function post_activity_item($arr, $allow_code = false, $deliver = true) {
 	$arr['comment_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'post_comments'));
 
 	if ((! $arr['plink']) && (intval($arr['item_thread_top']))) {
-		$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']);
+		$arr['plink'] = substr(z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']),0,190);
 	}
 
 
@@ -3009,14 +3009,17 @@ function check_item_source($uid, $item) {
 	$words = explode("\n",$r[0]['src_patt']);
 	if($words) {
 		foreach($words as $word) {
-			if(substr($word,0,1) === '#' && $tags) {
+			$w = trim($word);
+			if(! $w)
+				continue;
+			if(substr($w,0,1) === '#' && $tags) {
 				foreach($tags as $t)
-					if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
+					if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($w,1)) || (substr($w,1) === '*')))
 						return true;
 			}
-			elseif((strpos($word,'/') === 0) && preg_match($word,$text))
+			elseif((strpos($w,'/') === 0) && preg_match($w,$text))
 				return true;
-			elseif(stristr($text,$word) !== false)
+			elseif(stristr($text,$w) !== false)
 				return true;
 		}
 	}