aboutsummaryrefslogtreecommitdiffstats
path: root/include/delivery.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-16 16:33:31 -0700
committerfriendica <info@friendica.com>2012-07-16 16:33:31 -0700
commit44638184c322ce84e94d7135426f95bb3427d018 (patch)
tree060d2ecada5e7a4748b1495c093b6fbb66f0dd45 /include/delivery.php
parent5902e0983d8a17e34674855bee36b75a82bff8cb (diff)
downloadvolse-hubzilla-44638184c322ce84e94d7135426f95bb3427d018.tar.gz
volse-hubzilla-44638184c322ce84e94d7135426f95bb3427d018.tar.bz2
volse-hubzilla-44638184c322ce84e94d7135426f95bb3427d018.zip
the pioneers should at least have a current db - it will likely be some time before db updates go into this tree as many incompatible things are changing and cannot be automatically migrated, so it will probably mean frequent reinstalls.
Diffstat (limited to 'include/delivery.php')
-rw-r--r--include/delivery.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/delivery.php b/include/delivery.php
index 595c5279d..38b6690a9 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -155,8 +155,7 @@ function delivery_run($argv, $argc){
}
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
- `user`.`timezone`, `user`.`nickname`,
- `user`.`page-flags`, `user`.`prvnets`
+ `user`.`timezone`, `user`.`nickname`, `user`.`page-flags`
FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
intval($uid)
@@ -366,9 +365,6 @@ function delivery_run($argv, $argc){
case NETWORK_OSTATUS :
- // Do not send to otatus if we are not configured to send to public networks
- if($owner['prvnets'])
- break;
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
break;