Merge https://github.com/redmatrix/redmatrix into pending_merge

2015-09-28 19:06:10 -07:00
parent 8a3c909c74 3a8e1e0484
commit 50ee82e8bd
3 changed files with 11 additions and 1 deletions
--- a/include/zot.php
+++ b/include/zot.php
@@ -1587,6 +1587,12 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 		$channel = $r[0];
 		$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');

+		if($d['hash'] === $sender['hash']) {
+			$DR->update('self delivery ignored');
+			$result[] = $DR->get();
+			continue;
+		}
+

 		if($d['hash'] === $sender['hash']) {
 			$DR->update('self delivery ignored');