Skip to content
Snippets Groups Projects
Commit 0c32eabb authored by Jared Hancock's avatar Jared Hancock
Browse files

Fixup merging of email recipients

This stems from a confusing similarity between the + operator for arrays
and array_merge() in php. Adding arrays will ignore items in the RHS where
keys are present in the LHS. Therefore, when adding numerically indexed
arrays together, only items on the RHS that have a key higher than the
greatest key on the LHS will be included.
parent f40c018d
No related branches found
No related tags found
No related merge requests found
...@@ -1132,7 +1132,7 @@ class Ticket { ...@@ -1132,7 +1132,7 @@ class Ticket {
$recipients[] = $assignee; $recipients[] = $assignee;
} elseif(!strcasecmp(get_class($assignee), 'Team')) { } elseif(!strcasecmp(get_class($assignee), 'Team')) {
if($cfg->alertTeamMembersONAssignment() && ($members=$assignee->getMembers())) if($cfg->alertTeamMembersONAssignment() && ($members=$assignee->getMembers()))
$recipients+=$members; $recipients = array_merge($recipients, $members);
elseif($cfg->alertTeamLeadONAssignment() && ($lead=$assignee->getTeamLead())) elseif($cfg->alertTeamLeadONAssignment() && ($lead=$assignee->getTeamLead()))
$recipients[] = $lead; $recipients[] = $lead;
} }
...@@ -1388,11 +1388,11 @@ class Ticket { ...@@ -1388,11 +1388,11 @@ class Ticket {
if($this->getStaffId()) if($this->getStaffId())
$recipients[]=$this->getStaff(); $recipients[]=$this->getStaff();
elseif($this->getTeamId() && ($team=$this->getTeam()) && ($members=$team->getMembers())) elseif($this->getTeamId() && ($team=$this->getTeam()) && ($members=$team->getMembers()))
$recipients+=$members; $recipients = array_merge($recipients, $members);
} elseif($cfg->alertDeptMembersONTransfer() && !$this->isAssigned()) { } elseif($cfg->alertDeptMembersONTransfer() && !$this->isAssigned()) {
//Only alerts dept members if the ticket is NOT assigned. //Only alerts dept members if the ticket is NOT assigned.
if(($members=$dept->getMembers())) if(($members=$dept->getMembers()))
$recipients+=$members; $recipients = array_merge($recipients, $members);
} }
//Always alert dept manager?? //Always alert dept manager??
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment