Revert "[REF] Code readability changes on activity tokens."
authoreileen <emcnaughton@wikimedia.org>
Wed, 20 May 2020 03:14:03 +0000 (15:14 +1200)
committereileen <emcnaughton@wikimedia.org>
Wed, 20 May 2020 03:15:14 +0000 (15:15 +1200)
commit51e25a2330ad6b690b20267ff65c70430ef6fd24
tree592fa98fc163d7e7de6adb58aee5466ba5eddf78
parent8d0e37b6b8fc657f225e1048d2e379ecc5cd054e
Revert "[REF] Code readability changes on activity tokens."

Per https://docs.civicrm.org/dev/en/latest/framework/token/#token-processor
The contactId is actually documented. While I've been removing those in various places in
favour of contactID or contact_id it seems Tim has been putting them in so
I think it's safer to revert this change at this stage

This reverts commit 2ebb452b239c28e7ed2c50da69d324a8d40a7e88.
CRM/Activity/Form/Task/PDFLetterCommon.php
CRM/Activity/Tokens.php
CRM/Core/TokenTrait.php
Civi/Token/TokenProcessor.php