diff options
author | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
---|---|---|
committer | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
commit | 32522b61f235266384c81c0669fceaf58afeb4fe (patch) | |
tree | 48427e8f48421b3bb8f344d85f2ebfe1271ea34e /include/items.php | |
parent | 11c1573b55f278a664a90a2872d06a40b3ac3026 (diff) | |
parent | 1da3828a09485a9b2bc6113cbab9ca9ca483ffc0 (diff) | |
download | volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.gz volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.bz2 volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.zip |
Merge pull request #6 from redmatrix/master
updating from original codebase
Diffstat (limited to 'include/items.php')
-rwxr-xr-x | include/items.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 7793d1fb2..e7cc02579 100755 --- a/include/items.php +++ b/include/items.php @@ -3522,11 +3522,17 @@ function mail_store($arr) { dbesc($arr['mid']), intval($arr['channel_id']) ); + if($r) { logger('mail_store: duplicate item ignored. ' . print_r($arr,true)); return 0; } + if(! $r && $arr['mail_recalled'] == 1) { + logger('mail_store: recalled item not found. ' . print_r($arr,true)); + return 0; + } + call_hooks('post_mail',$arr); if(x($arr,'cancel')) { |