diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 19:06:10 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 19:06:10 -0700 |
| commit | 50ee82e8bd031abe969ad304233cfdb9849bdac6 (patch) | |
| tree | ed2d8d5ed11d7787b780b226d144b0b57203dbf3 | |
| parent | 8a3c909c74285177bc801d94d49122aca274836e (diff) | |
| parent | 3a8e1e04844fea2331525d82d8234b7006a12037 (diff) | |
| download | volse-hubzilla-50ee82e8bd031abe969ad304233cfdb9849bdac6.tar.gz volse-hubzilla-50ee82e8bd031abe969ad304233cfdb9849bdac6.tar.bz2 volse-hubzilla-50ee82e8bd031abe969ad304233cfdb9849bdac6.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
| -rw-r--r-- | include/zot.php | 6 | ||||
| -rw-r--r-- | install/update.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
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 |