projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #11881 from yashodha/CRM-21854
[civicrm-core.git]
/
CRM
/
Core
/
ManagedEntities.php
diff --git
a/CRM/Core/ManagedEntities.php
b/CRM/Core/ManagedEntities.php
index 5021859b01c0ef9a2cbabd1fa397aa7f369d5a34..fe9631d0dbd0a0ef1d5b3bd9413bec6c0e42013b 100644
(file)
--- a/
CRM/Core/ManagedEntities.php
+++ b/
CRM/Core/ManagedEntities.php
@@
-191,6
+191,7
@@
class CRM_Core_ManagedEntities {
$in = CRM_Core_DAO::escapeStrings(array_keys($this->moduleIndex[FALSE]));
$dao = new CRM_Core_DAO_Managed();
$dao->whereAdd("module in ($in)");
$in = CRM_Core_DAO::escapeStrings(array_keys($this->moduleIndex[FALSE]));
$dao = new CRM_Core_DAO_Managed();
$dao->whereAdd("module in ($in)");
+ $dao->orderBy('id DESC');
$dao->find();
while ($dao->fetch()) {
$this->disableEntity($dao);
$dao->find();
while ($dao->fetch()) {
$this->disableEntity($dao);
@@
-215,6
+216,7
@@
class CRM_Core_ManagedEntities {
if (!empty($knownModules)) {
$in = CRM_Core_DAO::escapeStrings($knownModules);
$dao->whereAdd("module NOT IN ($in)");
if (!empty($knownModules)) {
$in = CRM_Core_DAO::escapeStrings($knownModules);
$dao->whereAdd("module NOT IN ($in)");
+ $dao->orderBy('id DESC');
}
$dao->find();
while ($dao->fetch()) {
}
$dao->find();
while ($dao->fetch()) {
@@
-340,11
+342,10
@@
class CRM_Core_ManagedEntities {
if ($result['is_error']) {
$this->onApiError($dao->entity_type, 'delete', $params, $result);
}
if ($result['is_error']) {
$this->onApiError($dao->entity_type, 'delete', $params, $result);
}
-
- CRM_Core_DAO::executeQuery('DELETE FROM civicrm_managed WHERE id = %1', array(
- 1 => array($dao->id, 'Integer'),
- ));
}
}
+ CRM_Core_DAO::executeQuery('DELETE FROM civicrm_managed WHERE id = %1', array(
+ 1 => array($dao->id, 'Integer'),
+ ));
}
}
}
}