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

Patch - SUPEE-10415 / 1.9.3.7 #393

Merged
merged 1 commit into from
Nov 29, 2017
Merged

Patch - SUPEE-10415 / 1.9.3.7 #393

merged 1 commit into from
Nov 29, 2017

Conversation

spinsch
Copy link
Contributor

@spinsch spinsch commented Nov 29, 2017

/**
* Maximum Password Length
*/
const MAXIMUM_PASSWORD_LENGTH = 256;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never used

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be - it's used here: https://github.com/OpenMage/magento-mirror/blob/a5ad2ee47599400ef0066562315b300c7f581938/app/code/core/Mage/Customer/Model/Customer.php

@spinsch Where there any issues applying the patch? Or is this an issue with the patch released by Magento?

Copy link
Contributor Author

@spinsch spinsch Nov 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry. It was my fault - the release from Magento is ok.

Update
Now i made a rebase of the current patch with the missing part.

@drobinson
Copy link
Collaborator

@spinsch Seems it's still missing some things - see diff between these diffs

https://patch-diff.githubusercontent.com/raw/OpenMage/magento-lts/pull/393.diff
vs
https://github.com/OpenMage/magento-mirror/commit/a5ad2ee47599400ef0066562315b300c7f581938.diff

Typically what I do to apply these patches is grab the latest diff from Magento-Mirror and apply it directly to this repo - this usually results in fewer conflicts during the patch process.

@spinsch
Copy link
Contributor Author

spinsch commented Nov 29, 2017

@drobinson: sorry for my mistakes. I‘ve downloaded the official archives and compared them manually to make the patch. It was a bad idea 😌

The current version is made now how you have explained it, namely with a diff of the magento-mirror repository and the merging in our repository. I learn each day and will do it better for the future.

@drobinson
Copy link
Collaborator

Looks good - much appreciated @spinsch

I learn each day and will do it better for the future.

I think we all hope to do the same!

@drobinson drobinson merged commit cb7e15e into OpenMage:1.9.3.x Nov 29, 2017
@sreichel sreichel added the patch label Jan 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants