Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 631e9fba919eaa3fa1254561bd1b9d8ec323fa98..67d36e70f295fbe42dedadaf49fd852d18400f2d 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -589,7 +589,7 @@ function diaspora_request($importer,$xml) {
                        intval($importer['uid'])
                );
 
-               if((count($r)) && (! $r[0]['hide-friends']) && (! $contact['hidden'])) {
+               if((count($r)) && (!$r[0]['hide-friends']) && (!$contact['hidden']) && intval(get_pconfig($importer['uid'],'system','post_newfriend'))) {
                        require_once('include/items.php');
 
                        $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",