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/notifier.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/notifier.php')
| -rw-r--r-- | include/notifier.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/notifier.php b/include/notifier.php index fe6cc394e..443cc3014 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -125,7 +125,7 @@ function notifier_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) return; @@ -709,11 +709,11 @@ function notifier_run($argv, $argc){ } break; case NETWORK_DIASPORA: + require_once('include/diaspora.php'); + if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled'))) break; - require_once('include/diaspora.php'); - if($mail) { diaspora_send_mail($item,$owner,$contact); break; @@ -860,17 +860,13 @@ function notifier_run($argv, $argc){ } - - // If the item was deleted, clean up the `sign` table (for Diaspora signatures) - // Do this even if Diaspora support is disabled, as it may have been enabled in - // the past + // If the item was deleted, clean up the `sign` table if($target_item['deleted']) { $r = q("DELETE FROM sign where `retract_iid` = %d", intval($target_item['id']) ); } - logger('notifier: calling hooks', LOGGER_DEBUG); if($normal_mode) |