CRM-19303 - Drupal - Restore getCiviSourceStorage() #10577
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 partially reverts changes made under CRM-19303: * The changes to `getDefaultFileStorage()` are preserved * The changes to `getCiviSourceStorage()` are reverted * To avoid conflicts, `parseDrupalSiteName()` has been split into the older `parseDrupalSiteNameFromRoot()` and the newer `parseDrupalSiteNameFromRequest()`. (IMHO, `parseDrupalSiteNameFromRequest()` is more correct, but `parseDrupalSiteNameFromRoot()` is more compatible with existing deployments). As discussed in [PR civicrm#10513](civicrm#10513 (comment)), we should stop trying so hard to autodetect these things. We'll treat the auto-detection stuff as legacy, and should shift toward a simpler/flatter arrangement which encourages paths/URLs to be stored in `civicrm.settings.php`.
|
jenkins, test this please |
totten
changed the title
|
Note: I've opened the PR so that the code can be shared/tested. However, I haven't yet reetsted this code in a multisite environment. Hoping for @adixon to give a whirl today. |
|
Tested on my multisite, works. |
|
@totten tested on AUG server as well and looks good to me |
|
Thanks, @adixon @seamuslee001. Also works on my local multisite and singlesite. |
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 partially reverts changes made under CRM-19303:
getDefaultFileStorage()are preservedgetCiviSourceStorage()are revertedparseDrupalSiteName()has been split into the olderparseDrupalSiteNameFromRoot()and the newerparseDrupalSiteNameFromRequest().(IMHO,
parseDrupalSiteNameFromRequest()is more correct, butparseDrupalSiteNameFromRoot()is more compatible with existing deployments).As discussed in PR #10513,
we should stop trying so hard to autodetect these things. We'll treat the
auto-detection stuff as legacy, and should shift toward a simpler/flatter arrangement
which encourages paths/URLs to be stored in
civicrm.settings.php.