Merge remote-tracking branch 'friendika/master'

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 77a37b5eac6cc6822c8710d7f48b51e9346e09cd..9f5b27148270cc5144e6139940533e41a3cdc62f 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -145,7 +145,7 @@ function notifier_run($argv, $argc){
 
                $parent = $items[0];
 
-               if($parent['wall'] != 0 && (! $expire)) {
+               if($parent['wall'] == 0 && (! $expire)) {
                        // local followup to remote post
                        $followup = true;
                        $notify_hub = false; // not public
@@ -504,7 +504,7 @@ function notifier_run($argv, $argc){
                
        // send additional slaps to mentioned remote tags (@foo@example.com)
 
-       if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
+       if($slap && count($url_recipients) && ($followup || $top_level) && $notify_hub && (! $expire)) {
                if(! get_config('system','dfrn_only')) {
                        foreach($url_recipients as $url) {
                                if($url) {