harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
This commit is contained in:
redmatrix 2015-08-05 16:13:42 -07:00
commit 03a833f2f8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/items.php
View File

@ -3338,6 +3338,9 @@ function check_item_source($uid, $item) {
if($r[0]['src_channel_xchan'] === $item['owner_xchan']) if($r[0]['src_channel_xchan'] === $item['owner_xchan'])
return false; 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']) if(! $r[0]['src_patt'])
return true; return true;
@ -3352,10 +3355,10 @@ function check_item_source($uid, $item) {
foreach($words as $word) { foreach($words as $word) {
if(substr($word,0,1) === '#' && $tags) { if(substr($word,0,1) === '#' && $tags) {
foreach($tags as $t) 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; return true;
} }
elseif((strpos($word,'/') === 0) && preg_match($word,$body)) elseif((strpos($word,'/') === 0) && preg_match($word,$text))
return true; return true;
elseif(stristr($text,$word) !== false) elseif(stristr($text,$word) !== false)
return true; return true;
@ -3402,10 +3405,10 @@ function post_is_importable($item,$abook) {
$word = trim($word); $word = trim($word);
if(substr($word,0,1) === '#' && $tags) { if(substr($word,0,1) === '#' && $tags) {
foreach($tags as $t) 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; return false;
} }
elseif((strpos($word,'/') === 0) && preg_match($word,$body)) elseif((strpos($word,'/') === 0) && preg_match($word,$text))
return false; return false;
elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0)) elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
return false; return false;
@ -3421,10 +3424,10 @@ function post_is_importable($item,$abook) {
$word = trim($word); $word = trim($word);
if(substr($word,0,1) === '#' && $tags) { if(substr($word,0,1) === '#' && $tags) {
foreach($tags as $t) 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; return true;
} }
elseif((strpos($word,'/') === 0) && preg_match($word,$body)) elseif((strpos($word,'/') === 0) && preg_match($word,$text))
return true; return true;
elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0)) elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
return true; return true;

2
version.inc
View File

@ -1 +1 @@
2015-08-04.1114 2015-08-05.1115