Merge pull request #6559 from jitendrapurohit/CRM-16877
authorDave Greenberg <dave@civicrm.org>
Wed, 9 Sep 2015 19:28:33 +0000 (12:28 -0700)
committerDave Greenberg <dave@civicrm.org>
Wed, 9 Sep 2015 19:28:33 +0000 (12:28 -0700)
commitbeccc0d657ee873b40b54af732aed9f5a368a36f
tree2b563e40f812ca3863db8f22e93576eba0e35175
parent49343a5d1f87884c8be3f3e51a4b941376478267
parent139a60f319534bf29cf146dcd1b892345375c056
Merge pull request #6559 from jitendrapurohit/CRM-16877

CRM-16877 -- Include ID when editing 'block' fields (+ allow deletion…
CRM/Contact/BAO/Contact.php
CRM/Contact/Form/Contact.php
CRM/Contact/Form/Inline/Email.php
CRM/Contact/Form/Inline/IM.php
CRM/Contact/Form/Inline/OpenID.php
CRM/Contact/Form/Inline/Phone.php
CRM/Contact/Form/Inline/Website.php
CRM/Core/BAO/Address.php
CRM/Core/BAO/Block.php
CRM/Core/BAO/Website.php