MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2070 from annando/1511-local-delivery-soapbox

Browse source 
Local delivery of comments to soap boxes are working now
This commit is contained in:
fabrixxm 2015-11-13 09:15:56 +01:00
parent dab544ab76 5a8d66e2d4
commit fc0b3d58cf
3 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/delivery.php
View file

@ -340,9 +340,9 @@ function delivery_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');

4
include/notifier.php
View file

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