Issue #110 bring up to date with 7.x-master #113
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
The impetus behind CRM-20541 seems to be a testing scenario where the setup/teardown process resets Civi (`Civi::reset()`) without resetting Drupal (`drupal_static_reset()`). IMHO, it's better to keep the systems aligned by either (a) resetting both or (b) resetting neither. For the situation where you reset both, the state within `civicrm_initialize()` needs some way to reset. This function executes within a Drupal context (before Civi has booted), so it should obey the reset conventions for Drupal -- i.e. use `drupal_static()`.
CRM-19976: Fix for Drush: cannot disable civicrm debug
CRM-20541 - Use drupal_static() instead of static
CRM-21016: Allow Drupal views to be used for Notes related to contributions
Add Contributions relevant to the Participant record.
… views. This breaks views unless there is an ACL in place if Drush CC is used on the command line.
(NFC) Lint civicrm.drush.inc
…_alphabetically CiviCRM / Drupal Rules: Show all groups
NFC Civilint civicrm_contact_ref module
NFC Civilint civicrm_member_roles
Civilint Some views files and HookTest file
(NFC) Lint civicrm.config.php.drupal
providing clear indication that civicrm_engage module is deprecated.
[NFC] Update copyright date for 2020
(NFC) (dev/core#878) Simplify copyright header (D7)
Add participant is_test field to views
…or phpunit6 compatability
Update unit tests to use name spaced format of phpunit test classes f…
dev/drupal#102 Fix wiki link that goes nowhere
[NFC] Doc Block fix should be bool no boolean as per coding standards
CIVICRM-984: Make "Add CiviCRM Tag to Contact" action list tags
Update from upstream
|
(Standard links)
|
|
@seamuslee001 darn same result. This time I had done a fresh merge from upstream before applying changes. Not clear how I'm getting patch failed. Wondering if I should just scrap my fork entirely and restart. |
|
@seamuslee001 odd. This branch is up to date from civicrm-backdrop/1.x-master. Not clear to me why the patches won't apply.
|
|
@seamuslee001 same with the other way. Plus even this PR says it applies cleanly.
|
|
Perhaps the build script is still using
|
laryn
suggested changes
Mar 5, 2020
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.
https://github.com/civicrm/civicrm-backdrop/issues/110