Remove always-true if #24410
Merged
Remove always-true if #24410
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)
|
| @@ -342,74 +342,50 @@ public function import(array $values): void { | |||
| $this->deprecatedFormatParams($paramValues, $formatted); | |||
|
|
|||
| if ($this->isUpdateExisting()) { | |||
| //fix for CRM-2219 - Update Contribution | |||
| // onDuplicate == CRM_Import_Parser::DUPLICATE_UPDATE | |||
| if (!empty($paramValues['id'])) { | |||
There was a problem hiding this comment.
@eileenmcnaughton just wondering what if a user had chosen to do an update import but only was matching on transaction_id field not on the contribution.id field?
There was a problem hiding this comment.
@seamuslee001 - it is resolved back here -
|
Fail relates here - will fix .testPledgeImport |
26075f6 to
742e27e
Compare
742e27e to
7dcd2a4
Compare
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
Remove always-true if
Before
Both of these ifs are always true
https://github.com/civicrm/civicrm-core/compare/master...eileenmcnaughton:civicrm-core:import_cont?expand=1#diff-a223445bfabeca3421466f7add0f896b2f7126287cbbd3124665781336f086d9L347-L349
the first is because the id is already loaded earlier - or aborted if not possible
In addition the if
isUpdateExistinghas these lines https://github.com/civicrm/civicrm-core/compare/master...eileenmcnaughton:civicrm-core:import_cont?expand=1#diff-a223445bfabeca3421466f7add0f896b2f7126287cbbd3124665781336f086d9L395-L404 - but they also occur outside the statementAfter
Simplified - plus a couple of extraneous assignments
Technical Details
Comments
@colemanw should be straight forward