[REF] Extract getSearchSQL from getSearchQuery.

[eileenmcnaughton]

Overview

Code cleanup - function extraction

Before

Less readable

After

More readable

Technical Details

I made 2 changes over & above the function extraction

1. I changed one place in the code to call the new version - mostly for show - will do more later
2. I made it so the re-enable is called regardless of whether it was disabled after running the query. My logic is that it will only re-enabled IF it is enabled for the site so we should be safe. Doing this simplifies the code

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]

the re-enable function is safe as it re-enables if previously enabled but I won't enable if never enabled

[colemanw]

@eileenmcnaughton is this covered by tests?

[eileenmcnaughton]

@colemanw yep - this function is heavily tested

[colemanw]

Merging based on code review and passing tests.