Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop passing imProviders & phoneTypes - use CRM_Core_PseudoConstant:getLabel #12608

Merged
merged 1 commit into from
Aug 4, 2018

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Very minor code tidy up

Before

$phoneTypes, $imProviders passed around

After

$phoneTypes, $imProviders not passed around - CRM_Core_PseudoConstant:getLabel used

Technical Details

Note this function is called once per export - not per row

Comments

@colemanw are you able to merge this too - I figure if I do this as a really small one & get it merged I'll have less conflict issues

…getLabel(

Note this function is called once per export - not per row
@civibot
Copy link

civibot bot commented Aug 1, 2018

(Standard links)

@eileenmcnaughton
Copy link
Contributor Author

test this please

1 similar comment
@eileenmcnaughton
Copy link
Contributor Author

test this please

@@ -1528,12 +1526,11 @@ public static function getExportStructureArrays($returnProperties, $processor) {
$metadata = $headerRows = $outputColumns = $sqlColumns = array();
$phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
$imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these variables still used anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah - in this function they still are - hope to change that later on

@eileenmcnaughton
Copy link
Contributor Author

test this please

@eileenmcnaughton
Copy link
Contributor Author

@colemanw were you good to merge this?

@colemanw colemanw merged commit 2589da9 into civicrm:master Aug 4, 2018
@colemanw colemanw deleted the export_sigs branch August 4, 2018 00:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants