Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #110 bring up to date with 7.x-master #113

Open
wants to merge 177 commits into
base: 1.x-master
Choose a base branch
from

Conversation

herbdool
Copy link
Contributor

@herbdool herbdool commented Mar 4, 2020

totten and others added 30 commits May 18, 2017 13:01
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.
…_alphabetically

CiviCRM / Drupal Rules: Show all groups
Civilint Some views files and HookTest file
(NFC) Lint civicrm.config.php.drupal
eileenmcnaughton and others added 22 commits August 23, 2019 12:29
providing clear indication that civicrm_engage module is deprecated.
(NFC) (dev/core#878) Simplify copyright header (D7)
Add participant is_test field to views
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
@civibot
Copy link

civibot bot commented Mar 4, 2020

(Standard links)

@civibot civibot bot added the 1.x-master label Mar 4, 2020
@herbdool
Copy link
Contributor Author

herbdool commented Mar 4, 2020

@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.

@herbdool
Copy link
Contributor Author

herbdool commented Mar 4, 2020

@seamuslee001 odd. This branch is up to date from civicrm-backdrop/1.x-master. Not clear to me why the patches won't apply.

Screenshot from 2020-03-04 14-09-04

@herbdool
Copy link
Contributor Author

herbdool commented Mar 4, 2020

@seamuslee001 same with the other way. Plus even this PR says it applies cleanly.

Screenshot from 2020-03-04 14-14-42

@herbdool
Copy link
Contributor Author

herbdool commented Mar 4, 2020

Perhaps the build script is still using civicrm-drupal?

Screenshot from 2020-03-04 14-25-58

Copy link
Contributor

@laryn laryn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just glanced through so far but will try to test soon.

civicrm.module Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.