Merge remote-tracking branch 'upstream/master'

Merge upstream

1 files changed, 11 insertions, 0 deletions

diff --git a/include/notifier.php b/include/notifier.php
index d63ad7ae7..ca7c7b92e 100755..100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -537,6 +537,17 @@ function notifier_run($argv, $argc){
 								$x[0]['writable'] = 1;
 							}
 
+							// if contact's ssl policy changed, which we just determined
+							// is on our own server, update our contact links
+							
+							$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($x[0]['page-flags'] == PAGE_SOAPBOX)
+								break;
+
 							require_once('library/simplepie/simplepie.inc');
 							logger('mod-delivery: local delivery');
 							local_delivery($x[0],$atom);