fatal error fixes due to bad merge CRM-14276
authorkurund <kurund@civicrm.org>
Mon, 28 Apr 2014 18:59:18 +0000 (11:59 -0700)
committerkurund <kurund@civicrm.org>
Mon, 28 Apr 2014 18:59:18 +0000 (11:59 -0700)
commit250b3b1f8022c5ca864be5ee009f3c0839957dd9
tree40975f29e5afc49810ad5cad7fd6c7cb8aeaa6be
parent9e8298937544279f4996016b986101ae6e36dfe9
fatal error fixes due to bad merge CRM-14276

----------------------------------------
* CRM-14276: Hook for display name
  https://issues.civicrm.org/jira/browse/CRM-14276
CRM/Contact/BAO/Contact.php
CRM/Utils/Hook.php