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

dev/core#4487 Alternative option: Fix paymentBlock url concat #27037

Merged

Conversation

larssandergreen
Copy link
Contributor

@larssandergreen larssandergreen commented Aug 10, 2023

Overview

Alternate for #27031. I think this is little more readable and maintainable.

Before

Funky JS plus Smarty concatenation breaks if additional URL params are present

After

Less funky concatenation. Also simplified the ampersand situation a bit.

@civibot
Copy link

civibot bot commented Aug 10, 2023

Thank you for contributing to CiviCRM! ❤️ We will need to test and review the PR. 👷

Introduction for new contributors
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers

@civibot civibot bot added the master label Aug 10, 2023
@civibot
Copy link

civibot bot commented Aug 10, 2023

The issue associated with the Pull Request can be viewed at https://lab.civicrm.org/dev/core/-/issues/4487

@eileenmcnaughton
Copy link
Contributor

I like the idea of the & before not after - makes sense - will see if @sebalis can check it out

@sebalis
Copy link
Contributor

sebalis commented Aug 10, 2023

I’ve looked at the way this PR solves the issue and I like it much more. This file is now in use on our productive 5.58.1 instance and I’ve verified that contributions work with and without the extra URL parameter (language=en). Of course by using this file I have also inherited the other changes made since 5.58.1, which mainly seem to be QA plus extra checks with a condition called isBackOffice, and I hope that this won’t break anything if it’s used in 5.58.1 – a question unrelated to this PR, admittedly, but if you have any comment I’d be glad to know, otherwise I’ll risk it. In any case, please merge this PR (I have already closed mine) while still allowing me to be credited as a contributor; seems fair to me as I pointed out the issue and where it needed to be solved. ;-)

@colemanw colemanw merged commit bd44d23 into civicrm:master Aug 10, 2023
@larssandergreen
Copy link
Contributor Author

Thanks @sebalis. I think you're probably OK with the new version of the file, since the changes are just reducing PHP warnings, but no promises.

Sorry, this was merged before I saw your note, so I can't add you as a co-author any more.

@sebalis
Copy link
Contributor

sebalis commented Aug 11, 2023

Many thanks for the advice about the file, @larssandergreen – and not to worry, it seems that the contributor’s credit issue has been very kindly taken care of :-)

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.

4 participants