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

Deprecate some deprecated address functions: defaultCurrencySymbol #14687

Merged
merged 1 commit into from
Jul 1, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Reviewer's partial of #14576

Before

Deprecated calls to $config->defaultCurrencySymbol

After

Calls to CRM_Core_BAO_Country::defaultCurrencySymbol()

Technical Details

This is pretty confusing - $config->defaultCurrencySymbol calls

  'defaultCurrencySymbol' => ['callback', 'CRM_Core_BAO_Country', 'getDefaultCurrencySymbol'],

due to the magic merge - so changing $config->defaultCurrencySymbol to CRM_Core_BAO_Country::defaultCurrencySymbol() does the same thing (and probably I would have rathered keep the scope of one PR to just doing those swaps).

However that function https://github.com/civicrm/civicrm-core/compare/master...eileenmcnaughton:matt?expand=1#diff-cad2bac1dfa829957024f6c1da207254L163 was then calling $config->defaultCurrencySymbol(Civi::settings()->get('defaultCurrency')); which in turn calls CRM_Core_BAO_Country::defaultCurrencySymbol($defaultCurrency); so this cuts the extra function out of that loop & deprecates it

Comments

I didn't feel able to review changes to multiple functions in one hit so pulled out one change to review & merge in the first instance from the larger PR

@civibot
Copy link

civibot bot commented Jul 1, 2019

(Standard links)

@eileenmcnaughton
Copy link
Contributor Author

merge on pass as a reviewer's commit

@eileenmcnaughton
Copy link
Contributor Author

test this please

@eileenmcnaughton eileenmcnaughton merged commit 0f87088 into civicrm:master Jul 1, 2019
@eileenmcnaughton eileenmcnaughton deleted the matt branch July 1, 2019 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants