Merge pull request #2830 from annando/1610-account_type

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 9ac9f2391b6d2001c89414e6aba7d5b70ab46cbe..7c0ba63a6b41b9649cf30e925df64cf089e6ccd8 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -178,7 +178,7 @@ function delivery_run(&$argv, &$argc){
 
                $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
                        `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
-                       `user`.`page-flags`, `user`.`prvnets`
+                       `user`.`page-flags`, `user`.`account-type`, `user`.`prvnets`
                        FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
                        WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
                        intval($uid)
@@ -243,7 +243,8 @@ function delivery_run(&$argv, &$argc){
                        if ((strlen($parent['allow_cid']))
                                || (strlen($parent['allow_gid']))
                                || (strlen($parent['deny_cid']))
-                               || (strlen($parent['deny_gid']))) {
+                               || (strlen($parent['deny_gid']))
+                               || $parent["private"]) {
                                $public_message = false; // private recipients, not public
                        }