diff options
| author | Zach Prezkuta <fermion@gmx.com> | 2012-06-12 18:38:24 -0600 |
|---|---|---|
| committer | Zach Prezkuta <fermion@gmx.com> | 2012-06-25 19:03:03 -0600 |
| commit | c0c50ece0fa625b9b1c6bd89045b8f16057d8eb2 (patch) | |
| tree | fdec649f86e88038941806a40fedcf2c1823eb07 /include/delivery.php | |
| parent | 8bb7ab88fb8a1bfef198f6a2aff53a15e667aa59 (diff) | |
| download | volse-hubzilla-c0c50ece0fa625b9b1c6bd89045b8f16057d8eb2.tar.gz volse-hubzilla-c0c50ece0fa625b9b1c6bd89045b8f16057d8eb2.tar.bz2 volse-hubzilla-c0c50ece0fa625b9b1c6bd89045b8f16057d8eb2.zip | |
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
Diffstat (limited to 'include/delivery.php')
| -rw-r--r-- | include/delivery.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/delivery.php b/include/delivery.php index b60fef3bf..815287668 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -113,7 +113,7 @@ function delivery_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; - // The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up + // POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up if(! $parent_id) continue; @@ -492,9 +492,6 @@ function delivery_run($argv, $argc){ break; case NETWORK_DIASPORA : - if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) - break; - if($public_message) $loc = 'public batch ' . $contact['batch']; else @@ -502,6 +499,9 @@ function delivery_run($argv, $argc){ logger('delivery: diaspora batch deliver: ' . $loc); + if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) + break; + if((! $contact['pubkey']) && (! $public_message)) break; |