vcs.fsf.org Git - civicrm-core.git/commit

author	eileen <emcnaughton@wikimedia.org>
	Wed, 27 Mar 2019 02:07:02 +0000 (15:07 +1300)
committer	eileen <emcnaughton@wikimedia.org>
	Wed, 27 Mar 2019 02:07:44 +0000 (15:07 +1300)
commit	86b14b5914cd8966b7a878ec9f7599d5b41651b7
tree	8c3bc46858b28000e973a5002de982bcf9ad5ae2	tree \| snapshot (zip tar.gz)
parent	95ed97aa367ac073ffbbefe97bf6709f514ddbcd	commit \| diff

Fix mis-formatting of Email greeting id, Address greeting id etc

The formatting was inappropriately relying on the field's title in the IF clause. I added the location_entity to
the row so it would no longer have to guess

CRM/Dedupe/Merger.php		diff \| blob \| blame \| history
templates/CRM/Contact/Form/Merge.tpl		diff \| blob \| blame \| history

RSS Atom