aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/items.php7
-rw-r--r--version.inc2
2 files changed, 4 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php
index fdcae3a6c..f0b7d6a7f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3373,19 +3373,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
diff --git a/version.inc b/version.inc
index 35b7084c7..928fb3ee9 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-26.1105
+2015-07-27.1106