Move make-sure-single-set out of shared function

[eileenmcnaughton]

Overview

3 places in the code call this - in 2 _single is declared on the class as false
& hence don't need this - ergo it is only being done for the one remaining place
so it's not shared it's just a helper for that code & we should return it

Before

2/3 of the non-test places that call this set $_single (I also removed the unused var in the screenshot) so it doesn't make sense in the shared function

After

Out of the shared function, into the class that might need it - that class is not an OOO class or trait so it's harder to tell

Technical Details

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]

This seems fine to me merging