Commit 5fe218f5 authored by jaapjansma's avatar jaapjansma
Browse files

Fixed issue with wrong contact id.

parent 8ac3e780
...@@ -49,7 +49,7 @@ class CRM_ActivityTokens_Tokens { ...@@ -49,7 +49,7 @@ class CRM_ActivityTokens_Tokens {
$tokenValues = array(); $tokenValues = array();
foreach($contact_ids as $contact_id) { foreach($contact_ids as $contact_id) {
$activity_id = $this->getActivityId($values, $cids); $activity_id = $this->getActivityId($values, $contact_id);
$tokenValues[$contact_id] = $this->getActivityContacts(array($activity_id), $record_type); $tokenValues[$contact_id] = $this->getActivityContacts(array($activity_id), $record_type);
} }
$this->setTokenValue($values, $cids, $token, $tokenValues); $this->setTokenValue($values, $cids, $token, $tokenValues);
...@@ -96,7 +96,7 @@ class CRM_ActivityTokens_Tokens { ...@@ -96,7 +96,7 @@ class CRM_ActivityTokens_Tokens {
$activity_id = false; $activity_id = false;
if (isset($values[$cid]) && is_array($values[$cid]) && isset($values[$cid]['activity_id'])) { if (isset($values[$cid]) && is_array($values[$cid]) && isset($values[$cid]['activity_id'])) {
$activity_id = $values[$cid]['activity_id']; $activity_id = $values[$cid]['activity_id'];
} elseif ($values['activity_id']) { } elseif (isset($values['activity_id']) && $values['activity_id']) {
$activity_id = $values['activity_id']; $activity_id = $values['activity_id'];
} }
return $activity_id; return $activity_id;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls> </urls>
<releaseDate>2019-04-01</releaseDate> <releaseDate>2019-04-01</releaseDate>
<version>1.0</version> <version>1.1</version>
<develStage>stable</develStage> <develStage>stable</develStage>
<compatibility> <compatibility>
<ver>5.0</ver> <ver>5.0</ver>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment