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:
	doc/to_do_code.bb
This commit is contained in:
redmatrix
2015-07-21 17:13:48 -07:00
parent 24ec104819 3ec6a431b6
commit c90f14c066
24 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/items.php
View File

@@ -3384,6 +3384,11 @@ function post_is_importable($item,$abook) {
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);
$lang = null;
if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_incl'],'lang=') !== false))
$lang = detect_language($text);
$tags = ((count($item['term'])) ? $item['term'] : false);
// exclude always has priority
@@ -3400,6 +3405,8 @@ function post_is_importable($item,$abook) {
}
elseif((strpos($word,'/') === 0) && preg_match($word,$body))
return false;
elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
return false;
elseif(stristr($text,$word) !== false)
return false;
}
@@ -3417,6 +3424,8 @@ function post_is_importable($item,$abook) {
}
elseif((strpos($word,'/') === 0) && preg_match($word,$body))
return true;
elseif((strpos($word,'lang=') === 0) && ($lang) && (strcasecmp($lang,trim(substr($word,5))) == 0))
return true;
elseif(stristr($text,$word) !== false)
return true;
}