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 #2925 from eileenmcnaughton/CRM-14501
[civicrm-core.git]
/
CRM
/
Core
/
Invoke.php
diff --git
a/CRM/Core/Invoke.php
b/CRM/Core/Invoke.php
index 221504f2101f2219bed378200553cc19ca0ae627..7df01124bf0a3212513e0fbf6eb3fd182b3e980b 100644
(file)
--- a/
CRM/Core/Invoke.php
+++ b/
CRM/Core/Invoke.php
@@
-483,17
+483,20
@@
class CRM_Core_Invoke {
$config = CRM_Core_Config::singleton();
$config->clearModuleList();
$config = CRM_Core_Config::singleton();
$config->clearModuleList();
+ // also cleanup all caches
+ $config->cleanupCaches($sessionReset || CRM_Utils_Request::retrieve('sessionReset', 'Boolean', CRM_Core_DAO::$_nullObject, FALSE, 0, 'GET'));
+
CRM_Core_Menu::store();
// also reset navigation
CRM_Core_BAO_Navigation::resetNavigation();
CRM_Core_Menu::store();
// also reset navigation
CRM_Core_BAO_Navigation::resetNavigation();
- // also cleanup all caches
- $config->cleanupCaches($sessionReset || CRM_Utils_Request::retrieve('sessionReset', 'Boolean', CRM_Core_DAO::$_nullObject, FALSE, 0, 'GET'));
-
// also cleanup module permissions
$config->cleanupPermissions();
// also cleanup module permissions
$config->cleanupPermissions();
+ // also rebuild word replacement cache
+ CRM_Core_BAO_WordReplacement::rebuild();
+
CRM_Core_BAO_Setting::updateSettingsFromMetaData();
CRM_Core_Resources::singleton()->resetCacheCode();
CRM_Core_BAO_Setting::updateSettingsFromMetaData();
CRM_Core_Resources::singleton()->resetCacheCode();
@@
-504,7
+507,7
@@
class CRM_Core_Invoke {
) {
CRM_Core_DAO::triggerRebuild();
}
) {
CRM_Core_DAO::triggerRebuild();
}
-
+ CRM_Core_DAO_AllCoreTables::reinitializeCache(TRUE);
CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();
}
}
CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();
}
}