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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
This commit is contained in:
redmatrix
2015-06-29 18:01:51 -07:00
parent 63f2e9b412 2072ea721f
commit 6e8ad5089e
7 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/notifier.php
View File

@@ -354,7 +354,7 @@ function notifier_run($argv, $argc){
return;
}
$s = q("select * from channel where channel_id = %d limit 1",
$s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
intval($target_item['uid'])
);
if($s)
@@ -505,6 +505,15 @@ function notifier_run($argv, $argc){
$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
if($private)
$env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig'],'hash' => $d['xchan_hash']);
if($d['xchan_network'] === 'mail' && $normal_mode) {
$delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode');
if(! $delivery_options)
format_and_send_email($channel,$d,$target_item);
}
}
}