X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnotifier.php;h=2562f09eb05bb53f64187268a54d3ba1c72afe86;hb=3da3cd686cc7fa51e2c98e98dbf8bd3a65880bdd;hp=c81ca2d15326a9abcf6c35adcf958c53de3c1c9b;hpb=4f4a873da80c01e14007303a46bd8d98c7eaa8c6;p=friendica.git diff --git a/include/notifier.php b/include/notifier.php index c81ca2d153..2562f09eb0 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -323,7 +323,7 @@ function notifier_run($argv, $argc){ $birthday = '' . xmlify($birthday) . ''; $atom .= replace_macros($feed_template, array( - '$version' => xmlify(FRIENDIKA_VERSION), + '$version' => xmlify(FRIENDICA_VERSION), '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ), '$feed_title' => xmlify($owner['name']), '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) , @@ -663,7 +663,15 @@ function notifier_run($argv, $argc){ case NETWORK_DIASPORA: require_once('include/diaspora.php'); - if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) + if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled'))) + break; + + if($mail) { + diaspora_send_mail($item,$owner,$contact); + break; + } + + if(! $normal_mode) break; // special handling for followup to public post