aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/zot.php6
-rw-r--r--install/update.php4
-rw-r--r--version.inc2
3 files changed, 11 insertions, 1 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');
diff --git a/install/update.php b/install/update.php
index 059d69d14..ca4e90a9d 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1884,3 +1884,7 @@ function update_r1155() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
+
+function update_r1155() {
+ return UPDATE_SUCCESS;
+}
diff --git a/version.inc b/version.inc
index 0384d000f..80d66264c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-27.1168
+2015-09-28.1169