MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Only some code beautification. No functional changes.

Browse source
This commit is contained in:
Michael Vogel 2014-03-20 18:46:01 +01:00
parent eaa05a9203
commit 2a21fecd79
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/delivery.php
View file

@ -366,7 +366,6 @@ function delivery_run(&$argv, &$argc){
break; break;
case NETWORK_OSTATUS : case NETWORK_OSTATUS :
// Do not send to otatus if we are not configured to send to public networks // Do not send to otatus if we are not configured to send to public networks
if($owner['prvnets']) if($owner['prvnets'])
break; break;

4
include/notifier.php
View file

@ -696,6 +696,7 @@ function notifier_run(&$argv, &$argc){
// Do not send to ostatus if we are not configured to send to public networks // Do not send to ostatus if we are not configured to send to public networks
if($owner['prvnets']) if($owner['prvnets'])
break; break;
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
break; break;
@ -707,8 +708,7 @@ function notifier_run(&$argv, &$argc){
// queue message for redelivery // queue message for redelivery
add_to_queue($contact['id'],NETWORK_OSTATUS,$slap); add_to_queue($contact['id'],NETWORK_OSTATUS,$slap);
} }
} } else {
else {
// only send salmon if public - e.g. if it's ok to notify // only send salmon if public - e.g. if it's ok to notify
// a public hub, it's ok to send a salmon // a public hub, it's ok to send a salmon