aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-05 16:13:42 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-05 16:13:42 -0700
commit03a833f2f8a1d68decc2c7ef85ddfff087ea4254 (patch)
tree6009bd2ef9e8adfa9d4687a48eb17ae35da7e7d8 /include
parentea63f3312fc69df6c9e9b55568933a65adafee77 (diff)
parentefa589300afb8b3c29e6a8b6a5886c444e26ac36 (diff)
downloadvolse-hubzilla-03a833f2f8a1d68decc2c7ef85ddfff087ea4254.tar.gz
volse-hubzilla-03a833f2f8a1d68decc2c7ef85ddfff087ea4254.tar.bz2
volse-hubzilla-03a833f2f8a1d68decc2c7ef85ddfff087ea4254.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: view/nl/messages.po view/nl/strings.php
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/include/items.php b/include/items.php
index 14b85c92e..c1b50da22 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3338,6 +3338,9 @@ function check_item_source($uid, $item) {
if($r[0]['src_channel_xchan'] === $item['owner_xchan'])
return false;
+
+ // since we now have connection filters with more features, the source filter is redundant and can probably go away
+
if(! $r[0]['src_patt'])
return true;
@@ -3352,10 +3355,10 @@ function check_item_source($uid, $item) {
foreach($words as $word) {
if(substr($word,0,1) === '#' && $tags) {
foreach($tags as $t)
- if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*')))
+ if(($t['type'] == TERM_HASHTAG) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
return true;
}
- elseif((strpos($word,'/') === 0) && preg_match($word,$body))
+ elseif((strpos($word,'/') === 0) && preg_match($word,$text))
return true;
elseif(stristr($text,$word) !== false)
return true;
@@ -3402,10 +3405,10 @@ function post_is_importable($item,$abook) {
$word = trim($word);
if(substr($word,0,1) === '#' && $tags) {
foreach($tags as $t)
- if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*')))
+ if(($t['type'] == TERM_HASHTAG) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
return false;
}
- elseif((strpos($word,'/') === 0) && preg_match($word,$body))
+ elseif((strpos($word,'/') === 0) && preg_match($word,$text))
return false;
elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
return false;
@@ -3421,10 +3424,10 @@ function post_is_importable($item,$abook) {
$word = trim($word);
if(substr($word,0,1) === '#' && $tags) {
foreach($tags as $t)
- if(($t['type'] == TERM_HASHTAG) && ((substr($t,1) === substr($word,1)) || (substr($word,1) === '*')))
+ if(($t['type'] == TERM_HASHTAG) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*')))
return true;
}
- elseif((strpos($word,'/') === 0) && preg_match($word,$body))
+ elseif((strpos($word,'/') === 0) && preg_match($word,$text))
return true;
elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
return true;