Skip to content

Commit

Permalink
Respect cleanup = never on disableEntities
Browse files Browse the repository at this point in the history
I'm hitting this as a bug on a cleanup=never entity which has a v4 api and not a v3 api so it could be
solved using more failure tolerance in the disable function or checking more values

However, I actually think the intuitive meaning of cleanup = never is 'never try to clean this up
' and I don't see why that would apply to uninstall & not disable
  • Loading branch information
eileenmcnaughton committed Apr 25, 2021
1 parent 6ae34f2 commit cfe00b3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CRM/Core/ManagedEntities.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public function reconcileDisabledModules() {

$in = CRM_Core_DAO::escapeStrings(array_keys($this->moduleIndex[FALSE]));
$dao = new CRM_Core_DAO_Managed();
$dao->whereAdd("module in ($in)");
$dao->whereAdd("module in ($in) AND cleanup != 'never'");
$dao->orderBy('id DESC');
$dao->find();
while ($dao->fetch()) {
Expand Down

0 comments on commit cfe00b3

Please sign in to comment.