diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-27 18:01:20 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-27 18:01:20 -0700 |
| commit | 3269d4632f180887d5eca96fcfaa03370bbae2a3 (patch) | |
| tree | 8f67725e77b4565a2cbac7e67de7ff952db01ee9 /include/items.php | |
| parent | 70a5a7b717955138279f2dd8f2a1de16aa76bd53 (diff) | |
| parent | 0b232a610cdcbb701dacf8dd661b86b64bb582fc (diff) | |
| download | volse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.tar.gz volse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.tar.bz2 volse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 7dd5a01d7..5d85e875e 100755 --- a/include/items.php +++ b/include/items.php @@ -3376,19 +3376,18 @@ function post_is_importable($item,$abook) { if(! $item) return false; - if((! $abook['abook_incl']) && (! $abook['abook_excl'])) + if(! ($abook['abook_incl'] || $abook['abook_excl'])) return true; - require_once('include/html2plain.php'); $text = prepare_text($item['body'],$item['mimetype']); $text = html2plain($text); $lang = null; - if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false)) + if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false)) { $lang = detect_language($text); - + } $tags = ((count($item['term'])) ? $item['term'] : false); // exclude always has priority |