aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-28 19:06:10 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-28 19:06:10 -0700
commit50ee82e8bd031abe969ad304233cfdb9849bdac6 (patch)
treeed2d8d5ed11d7787b780b226d144b0b57203dbf3 /include
parent8a3c909c74285177bc801d94d49122aca274836e (diff)
parent3a8e1e04844fea2331525d82d8234b7006a12037 (diff)
downloadvolse-hubzilla-50ee82e8bd031abe969ad304233cfdb9849bdac6.tar.gz
volse-hubzilla-50ee82e8bd031abe969ad304233cfdb9849bdac6.tar.bz2
volse-hubzilla-50ee82e8bd031abe969ad304233cfdb9849bdac6.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/zot.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php
index c6feb9174..eaaf30fff 100644
--- 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');