Crm 19847 #9653
Merged
Crm 19847 #9653
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
|
@jmcclelland : Can you please fix the style warning as per https://test.civicrm.org/job/CiviCRM-Core-PR/13345/checkstyleResult/new/ |
| 'gid' => $gid, | ||
| 'limit' => $limit | ||
| ); | ||
| $this->assign('urlQuery', implode('&', $urlQry)); |
There was a problem hiding this comment.
This will assign only values of $urlQry -- 1&$rgid&$gid&$limit which is completely different from the one assigned before. This breaks all the button URLs on the merge page.
|
OMG - Woops. That's sloppy on my part. Sorry to waste your time! Working on a fix now... |
jitendrapurohit
approved these changes
Jan 11, 2017
There was a problem hiding this comment.
I was able to reproduce the issue when context=conflict and action is update. This PR correctly removes the snippet param and redirects the page to complete dupePairs.
Thanks for the update @jmcclelland
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.
No description provided.