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

Fixed incorrect datetime in block, ref #1525 #4242

Merged
merged 15 commits into from
Oct 15, 2024
Merged

Conversation

sreichel
Copy link
Contributor

@sreichel sreichel commented Oct 2, 2024

Description (*)

#1525 was added to 20.0 branch (instead of v19).

This PR adds same functionality w/o BC-breaking changes (changed method signatures)

Related Pull Requests

  1. See Fixed incorrect datetime in block. #1525
  2. See [BC-Backport] Fixed incorrect datetime in block, ref #1525 #2940

Tests

@kiatng only thing that needs to be check is admin - manage customer - create date

@github-actions github-actions bot added Component: Core Relates to Mage_Core Component: Adminhtml Relates to Mage_Adminhtml labels Oct 2, 2024
@sreichel sreichel changed the title Backport: Backport: Fixed incorrect datetime in block, ref #1525 Oct 2, 2024
@sreichel sreichel requested a review from kiatng October 3, 2024 03:35
@ADDISON74
Copy link
Contributor

I was left with the impression that PR #1525 is already in OpenMage v20.

From the next branch, the following two PR should also be backported, because they concern security issues. I know they can create BC but the advantages with a good help are preferable.

Added form key validation to Contacts form
Check app/design/frontend/base/default/template/contacts/form.phtml in your theme and be sure that you've <?php echo $this->getBlockHtml('formkey') ?> under the <form opening tag, as shown here.

Unified CSRF configuration
If you enabled CSRF in System -> Configuration -> System (which you should!) then it will be enabled for all your forms and the checkout.

@sreichel
Copy link
Contributor Author

sreichel commented Oct 3, 2024

I was left with the impression that PR #1525 is already in OpenMage v20.

Have to change the title. #1525 was added to v20 (instead of v19) b/c it had some breaking changes. #2940 was made to fix #466 w/o breaking changes.

@sreichel sreichel changed the title Backport: Fixed incorrect datetime in block, ref #1525 Fixed incorrect datetime in block, ref #1525 Oct 3, 2024
@sreichel
Copy link
Contributor Author

sreichel commented Oct 3, 2024

From the next branch, the following two PR ...

Yep. I have it on screen, but wait for other PRs to get merged.

ADDISON74
ADDISON74 previously approved these changes Oct 4, 2024
@kiatng
Copy link
Contributor

kiatng commented Oct 8, 2024

Won't this PR break BC to PR #1525, which was merged 3 years ago?

@sreichel
Copy link
Contributor Author

sreichel commented Oct 9, 2024

Dont think so ... (?)

It does not change your code. formatDate() is forwarded to your changed method.

kiatng
kiatng previously approved these changes Oct 14, 2024
@github-actions github-actions bot added Template : admin Relates to admin template Component: Customer Relates to Mage_Customer labels Oct 14, 2024
@kiatng kiatng merged commit eda15ff into OpenMage:main Oct 15, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Adminhtml Relates to Mage_Adminhtml Component: Core Relates to Mage_Core Component: Customer Relates to Mage_Customer phpstan Template : admin Relates to admin template
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants