CRM-19303 - Drupal - Fix computation of civicrm.files
on multisite
#10511
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.
Description
Improve computation of
[civicrm.files]
URL and path when using Drupalmultisite.
A good way to test this is to open multiple tabs:
civicrm/admin/setting/url?reset=1
(one tab for each site)civicrm/admin/setting/path?reset=1
(one tab for each site)Before
The
[civicrm.files]
path/URL would always return thedefault
(e.g.
http://example.org/sites/default/civicrm/files
).The path and URL for
[civicrm.files]
and[civicrm.root]
are always computed.After
If a folder named
sites/{$NAME}/civicrm/files
exists, itwill be used. Otherwise, the folder
sites/default/files/civicrm
will be used.
The path and URL for
[civicrm.files]
and[civicrm.root]
are computed by default. However, as a last-resort, you can explicitly set these variables incivicrm.settings.php
, as in: