diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-30 12:21:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-30 12:21:36 +0200 |
| commit | e07ff7d3fbb9bef720831dc71470b70a882abfdf (patch) | |
| tree | 68934f0deb2fb9edef69954d1016734bc8662957 /include/items.php | |
| parent | b22fa9f7f4b77569c29b0fc881373393281b7bf4 (diff) | |
| parent | e769fbaffb09aa673d7475c598e7df7e7978d210 (diff) | |
| download | volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.gz volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.bz2 volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.zip | |
Merge remote-tracking branch 'upstream/master'
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')) { |