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

resolve conflicts

Browse Source
This commit is contained in:
redmatrix 2015-09-28 19:07:31 -07:00
parent 50ee82e8bd
commit 5c526995d8
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/zot.php
View File

@ -1587,13 +1587,6 @@ 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');
$result[] = $DR->get(); $result[] = $DR->get();

3
install/update.php
View File

@ -1885,6 +1885,3 @@ function update_r1155() {
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1155() {
return UPDATE_SUCCESS;
}