aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-29 22:19:44 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-29 22:19:44 -0700
commit97e8275dc2a63e465adb789be9f94597e5f4d400 (patch)
treebf1724dd78f5ee8fd7f6832e0993b3fa6b80e410 /include/items.php
parenta7135b5ecd1716575e1dfe608f744bf989381630 (diff)
parent0b347ccc14a384bfcbda343aacc1dfa1b7ddd740 (diff)
downloadvolse-hubzilla-97e8275dc2a63e465adb789be9f94597e5f4d400.tar.gz
volse-hubzilla-97e8275dc2a63e465adb789be9f94597e5f4d400.tar.bz2
volse-hubzilla-97e8275dc2a63e465adb789be9f94597e5f4d400.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index 5f479660e..059d9fd6a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3319,12 +3319,17 @@ function post_is_importable($item,$abook) {
if(! $abook)
return true;
+
+ if(($abook['abook_channel']) && (! feature_enabled($abook['abook_channel'],'connfilter')))
+ return true;
+
if(! $item)
return false;
if((! $abook['abook_incl']) && (! $abook['abook_excl']))
return true;
+
require_once('include/html2plain.php');
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);