[REF] Switch CRM_Utils_Array::value to empty in conditionals #17091
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
|
It would be good to get this merged so it doesn't conflict with other PRs. |
CRM/Contribute/Form/Contribution.php
Outdated
| @@ -369,7 +369,7 @@ public function setDefaultValues() { | |||
| $defaults['total_amount'] = CRM_Utils_Money::format($total_value, NULL, '%a'); | |||
| if (!empty($defaults['tax_amount'])) { | |||
| $componentDetails = CRM_Contribute_BAO_Contribution::getComponentDetails($this->_id); | |||
| if (!(CRM_Utils_Array::value('membership', $componentDetails) || CRM_Utils_Array::value('participant', $componentDetails))) { | |||
| if (!(!empty($componentDetails['membership']) || !empty($componentDetails['participant']))) { | |||
There was a problem hiding this comment.
This might be clearer as empty($componentDetails['membership']) && empty($componentDetails['participant'])
CRM/Contribute/Form/Contribution.php
Outdated
| @@ -1462,7 +1462,7 @@ protected function submit($submittedValues, $action, $pledgePaymentID) { | |||
| if ($this->_priceSetId && CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $this->_priceSetId, 'is_quick_config')) { | |||
| //CRM-16833: Ensure tax is applied only once for membership conribution, when status changed.(e.g Pending to Completed). | |||
| $componentDetails = CRM_Contribute_BAO_Contribution::getComponentDetails($this->_id); | |||
| if (!(CRM_Utils_Array::value('membership', $componentDetails) || CRM_Utils_Array::value('participant', $componentDetails))) { | |||
| if (!(!empty($componentDetails['membership']) || !empty($componentDetails['participant']))) { | |||
| @@ -55,7 +55,7 @@ public static function _invoke($args) { | |||
| return NULL; | |||
| } | |||
| // CRM-15901: Turn off PHP errors display for all ajax calls | |||
| if (CRM_Utils_Array::value(1, $args) == 'ajax' || CRM_Utils_Array::value('snippet', $_REQUEST)) { | |||
| if (CRM_Utils_Array::value(1, $args) == 'ajax' || !empty($_REQUEST['snippet'])) { | |||
| ini_set('display_errors', 0); | |||
| } | |||
There was a problem hiding this comment.
The replacement is fine but this has bugged me for a while and I wonder if there's a way to only do this when in production. Devs should have errors mess up their snippets. 😈
|
All the others look good. |
|
jenkins test this please |
|
Thanks @demeritcowboy I've made the changes you suggested. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Code refactor to fix some more cases of
CRM_Utils_Array::value