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.

Sign up for GitHub

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

Remove additional custom fields deletegroup functions #14823

Merged
merged 1 commit into from
Jul 15, 2019
Merged

Remove additional custom fields deletegroup functions #14823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sql/GenerateData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,8 @@ private function addGroup() {
//In this function when we add groups that time we are cache the contact fields
//But at the end of setup we are appending sample custom data, so for consistency
//reset the cache.
CRM_Core_BAO_Cache::deleteGroup('contact fields');
Civi::cache('fields')->flush();
CRM_Core_BAO_Cache::resetCaches();
}

/**
Expand Down
34 changes: 12 additions & 22 deletions sql/GenerateReportData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,29 +88,19 @@
*
*/

/*
* Note as of 2019-07-15 this file does not appear to be called
* from anywhere and seems to have issues running on more recent
* php versions.
* @todo look to remove this file completely.
*/


require_once '../civicrm.config.php';

require_once 'CRM/Core/Config.php';
require_once 'CRM/Core/Error.php';
require_once 'CRM/Core/I18n.php';

require_once 'CRM/Core/DAO/Address.php';
require_once 'CRM/Core/DAO.php';
require_once 'CRM/Core/DAO/Phone.php';
require_once 'CRM/Core/DAO/Email.php';
require_once 'CRM/Core/DAO/EntityTag.php';
require_once 'CRM/Core/DAO/Note.php';
require_once 'CRM/Core/DAO/Domain.php';

require_once 'CRM/Contact/DAO/Group.php';
require_once 'CRM/Contact/DAO/GroupContact.php';
require_once 'CRM/Contact/DAO/SubscriptionHistory.php';
require_once 'CRM/Contact/DAO/Contact.php';
require_once 'CRM/Contact/DAO/Relationship.php';
require_once 'CRM/Event/DAO/Participant.php';
require_once 'CRM/Contribute/DAO/ContributionSoft.php';
require_once 'CRM/Member/DAO/MembershipPayment.php';
// autoload
require_once 'CRM/Core/ClassLoader.php';
CRM_Core_ClassLoader::singleton()->register();

/**
* Class CRM_GCD
Expand Down Expand Up @@ -1173,8 +1163,8 @@ public function addGroup() {
//In this function when we add groups that time we are cache the contact fields
//But at the end of setup we are appending sample custom data, so for consistency
//reset the cache.
require_once 'CRM/Core/BAO/Cache.php';
CRM_Core_BAO_Cache::deleteGroup('contact fields');
Civi::cache('fields')->flush();
CRM_Core_BAO_Cache::resetCaches();
}

/**
Expand Down