harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
redmatrix 2015-09-28 19:06:10 -07:00
commit 50ee82e8bd
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/zot.php
View File

@ -1587,6 +1587,12 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
$channel = $r[0]; $channel = $r[0];
$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); $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']) { if($d['hash'] === $sender['hash']) {
$DR->update('self delivery ignored'); $DR->update('self delivery ignored');

4
install/update.php
View File

@ -1884,3 +1884,7 @@ function update_r1155() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1155() {
return UPDATE_SUCCESS;
}

2
version.inc
View File

@ -1 +1 @@
2015-09-27.1168 2015-09-28.1169