bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

revert extra Diaspora disabling changes to try to eliminate Mustard double-posting

Browse source
This commit is contained in:
Zach Prezkuta 2012-06-12 18:38:24 -06:00
commit c0c50ece0f
3 changed files with 23 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/notifier.php
View file

@ -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)