[REF] Preliminary cleanup in update greeting

[eileenmcnaughton]

Overview

[REF] Preliminary cleanup in update greeting

Before

Code is sooooo confusing

After

Code to get the greeting strings extracted

Technical Details

We start with

if ($contact->email_greeting_custom != 'null' && $contact->email_greeting_custom) {

}
elseif ($contact->email_greeting_id != 'null' && $contact->email_greeting_id) {
}
else {
   if ($contact->email_greeting_custom) {
}

Which leaves it very unclear what the last else is for.

My analysis is that this is

• if email_greeting_custom has a real value then use that as the email greeting template,
• if not but a real value (which means a number) has been passed for email_greeting_id then use the template corresponding to the id supplied

So the if clause winds up like

 if (!CRM_Utils_System::isNull($contact->email_greeting_custom)) {
}
 elseif (is_numeric($contact->email_greeting_id)) {
elseif ($contact->email_greeting_custom === 'null') {
}

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).

[eileenmcnaughton]

failures are now fixed in master - test this please

[eileenmcnaughton]

@seamuslee001 as dicussed - I took another look at where this got to & rebased & refreshed this PR to reflect interim merges

[seamuslee001]

This seems fine to me

[eileenmcnaughton]

unrelated fail