Merge pull request #2073 from annando/1511-avatar

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 4d97649c9536f40f2ff7f05a8621195d29793680..9dac5f114b177d617956a9772d733194d13bd0f1 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -734,9 +734,9 @@ function notifier_run(&$argv, &$argc){
                                                        $ssl_policy = get_config('system','ssl_policy');
                                                        fix_contact_ssl_policy($x[0],$ssl_policy);
 
-                                                       // If we are setup as a soapbox we aren't accepting input from this person
+                                                       // If we are setup as a soapbox we aren't accepting top level posts from this person
 
-                                                       if($x[0]['page-flags'] == PAGE_SOAPBOX)
+                                                       if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
                                                                break;
 
                                                        require_once('library/simplepie/simplepie.inc');
@@ -908,7 +908,7 @@ function notifier_run(&$argv, &$argc){
                                        if(! $contact['pubkey'])
                                                break;
 
-                                       $unsupported_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
+                                       $unsupported_activities = array(ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
 
                                        //don't transmit activities which are not supported by diaspora
                                        foreach($unsupported_activities as $act) {