checks for existing settings files before adding default files #4157
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
shelane
force-pushed
the
feature/default-settings
branch
from
2ba58f5
to
bfa30ce
Compare
shelane
force-pushed
the
feature/default-settings
branch
from
bfa30ce
to
36e14aa
Compare
danepowell
added a commit
that referenced
this pull request
Jun 22, 2020
Co-authored-by: Dane Powell <git@danepowell.com>
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 #4156
Changes proposed
On a
blt:init:settingsrun, check for the existence ofsites/settings/global.settings.phpfile and only copy the default file if it does not exist. Also, check if thesite/settings.phpfile exists and only issue the warning if it does not.Steps to replicate the issue
sites/settings/default.global.settings.phptosites/settings/global.settings.phpdefault.settings.phpfile from thesites/defaultdirectory where a multisite already has asettings.phpfile.sites/settings/default.global.settings.phpadded and warnings issued.Expected behavior, after applying PR and re-running test steps
No warnings should be generated where a settings.php exists for a site. It should still be given if it does not exist. The
sites/settings/default.global.settings.phpshould not reappear.Additional details
This is against the 12.x branch. Please also port to 11.x.