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

2015-06-29 22:19:44 -07:00
parent a7135b5ecd 0b347ccc14
commit 97e8275dc2
4 changed files with 12 additions and 0 deletions
--- 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);