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

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

Browse Source
This commit is contained in:
redmatrix 2015-09-29 16:56:50 -07:00
commit 8f7b869c08
3 changed files with 9055 additions and 8765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/items.php
View File

@ -3522,11 +3522,17 @@ function mail_store($arr) {
dbesc($arr['mid']), dbesc($arr['mid']),
intval($arr['channel_id']) intval($arr['channel_id'])
); );
if($r) { if($r) {
logger('mail_store: duplicate item ignored. ' . print_r($arr,true)); logger('mail_store: duplicate item ignored. ' . print_r($arr,true));
return 0; 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); call_hooks('post_mail',$arr);
if(x($arr,'cancel')) { if(x($arr,'cancel')) {

14663
view/nl/hmessages.po
View File

File diff suppressed because it is too large Load Diff

3165
view/nl/hstrings.php
View File

File diff suppressed because it is too large Load Diff