Reverse order in checking mail config styles #107
Merged
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
This reverses the order for checking mail configs by searching for the new format first, then checking for the old format. Laravel checks old format first, then new format, which works fine for them, but doesn't work for us as we also populate settings via the Backend, which populates the settings in the new format. Fixes wintercms/winter#626
|
@bennothommo could you go into more detail on this part:
|
|
@LukeTowers never mind that comment - I've just checked and @mjauvin's PR to the MailSetting model covers this scenario, so it should be fine to merge. |
LukeTowers
reviewed
Oct 17, 2022
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.
Fixes wintercms/winter#626
This reverses the order for checking mail configs by searching for the new format first, then checking for the old format.
Laravel checks old format first, then new format, which works fine for them, but doesn't work for us as we also populate settings via the Backend, which populates the settings in the new format.
There is a small gotcha here - I believe the Backend stored the config in the old format pre v1.2, which means if someone upgrades their
config/mail.phpto follow the new format, this will make the config file take precedence. Saving the settings in the Backend again will alleviate this.