projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
644587a
)
Drop Table before returning from function
author
Seamus Lee
<seamuslee001@gmail.com>
Tue, 29 Aug 2017 04:19:09 +0000
(14:19 +1000)
committer
Seamus Lee
<seamuslee001@gmail.com>
Tue, 29 Aug 2017 08:26:10 +0000
(18:26 +1000)
Include word temporary hopefully appeases jenkins
CRM/Contact/BAO/Relationship.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Contact/BAO/Relationship.php
b/CRM/Contact/BAO/Relationship.php
index ad3adc50281de2b5c3c2a6e85fecb31968f4b766..64edc3a979f19e424e77a0ed5fbc0f1b4c1f65c8 100644
(file)
--- a/
CRM/Contact/BAO/Relationship.php
+++ b/
CRM/Contact/BAO/Relationship.php
@@
-1291,6
+1291,7
@@
LEFT JOIN civicrm_country ON (civicrm_address.country_id = civicrm_country.id)
while ($relationship->fetch()) {
$relationshipCount += $relationship->cnt1 + $relationship->cnt2;
}
+ CRM_Core_DAO::executeQuery("DROP TEMPORARY TABLE IF EXISTS civicrm_contact_relationships");
return $relationshipCount;
}
else {
@@
-1444,6
+1445,7
@@
LEFT JOIN civicrm_country ON (civicrm_address.country_id = civicrm_country.id)
}
$relationship->free();
+ CRM_Core_DAO::executeQuery("DROP TEMPORARY TABLE IF EXISTS civicrm_contact_relationships");
return $values;
}
}