Allow explicit-automatic flags #150
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 looks like a copy-paste error. A few lines above, it prints `Options: $this->options`. It makes more sense for the subsequent statement to print`CMS: $cms`.
|
Test failures appear unrelated/pre-existing. |
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.
(This is extracted from the bigger #145, which needs some additional work before reaching its policy goal of flipping the defaults.)
Both
Bootstrap.phpandCmsBootstrap.phpcan be customized by environment variables (CIVICRM_SETTINGSandCIVICRM_BOOT, respectively). This patch adds a couple more options:Before: The values must concretely define the exact location of the
civicrm.settings.phpor of the CMS (respectively).Bootstrap, setCIVICRM_SETTINGS=/var/www/sites/default/civicrm.settings.phpCmsBootstrap, setCIVICRM_BOOT=Drupal://var/wwwAfter: The old values still work. Additionally, you can specifically indicate a preference for the default/automatic search behavior, i.e.
Bootstrap, setCIVICRM_SETTINGS=Auto(literally, "automatically find the settings file")CmsBootstrap, setCIVICRM_BOOT=Auto://.(literally, "automatically choose the CMS based on the current folder")The two notations are slightly because the two variables are already different. They aim to feel "ok" when compared to their other regular values.