projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for CRM-15750 advanced search using relationship and smart group produces backtrace
[civicrm-core.git]
/
CRM
/
Contact
/
BAO
/
Relationship.php
diff --git
a/CRM/Contact/BAO/Relationship.php
b/CRM/Contact/BAO/Relationship.php
index d5f0a02e03eb3df198ad88568bd7115aa63f96a5..15c4dc0d4a02492ed63b1c4f829abee876b7cc22 100644
(file)
--- a/
CRM/Contact/BAO/Relationship.php
+++ b/
CRM/Contact/BAO/Relationship.php
@@
-261,7
+261,7
@@
class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship {
$relationship->free();
$relationship->free();
- CRM_Utils_Hook::post($hook, 'Relationship', $relationship
I
d, $relationship);
+ CRM_Utils_Hook::post($hook, 'Relationship', $relationship
->i
d, $relationship);
return $relationship;
}
return $relationship;
}
@@
-491,7
+491,7
@@
class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship {
$relationship->delete();
CRM_Core_Session::setStatus(ts('Selected relationship has been deleted successfully.'), ts('Record Deleted'), 'success');
$relationship->delete();
CRM_Core_Session::setStatus(ts('Selected relationship has been deleted successfully.'), ts('Record Deleted'), 'success');
- CRM_Utils_Hook::post('delete', 'Relationship', $
relationship->
id, $relationship);
+ CRM_Utils_Hook::post('delete', 'Relationship', $id, $relationship);
// delete the recently created Relationship
$relationshipRecent = array(
// delete the recently created Relationship
$relationshipRecent = array(