Fix returnProperties on contact retrieval in Contact_Tokens to fetch less, less often

[eileenmcnaughton]

Overview

Reduces DB lookups when rendering tokens

Before

When a token is not found a db lookup is done to get all tokens in use. Even when prefix_id is found prefix_id:label is not.

After

• The code checks the base field (eg. prefix) before looking up the pseudoconstant
• The fields retrieved filters out any already-present fields

Technical Details

Deprecated tokens like email_greeting are still driving unnecessary lookups - but I'm gonna remove them from the core templates & put in the preferred token rather than worry about fixing performance for deprecated tokens

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[seamuslee001]

Our tests should be good enough to cover this here