From: Michael <heluecht@pirati.ca>
Date: Sun, 4 Nov 2018 18:54:49 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into diasppora-delivery
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd972151478f40f73585519110700222a1931d44;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into diasppora-delivery
---

bd972151478f40f73585519110700222a1931d44
diff --cc src/Worker/Notifier.php
index d4ec33b2ca,2d0140c171..8a35a34dcb
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@@ -419,11 -420,7 +420,11 @@@ class Notifie
  		// delivery loop
  		if (DBA::isResult($r)) {
  			foreach ($r as $contact) {
 +				if (($contact['network'] == Protocol::DIASPORA) && $diaspora_delivery && $public_message && !empty($contact['batch'])
 +					&& !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
 +					continue;
 +				}
- 				logger("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
+ 				Logger::log("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], Logger::DEBUG);
  
  				Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
  						'Delivery', $cmd, $item_id, (int)$contact['id']);