--HR-224 Reinitialize entity cache during installation

diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
index 516845ff4c8878b5ad1a44240e8125050d455c19..e1fe43347cacaaaec56294fc6ee905f3e4cfa671 100644 (file)
--- a/CRM/Core/Invoke.php
+++ b/CRM/Core/Invoke.php
@@ -507,7 +507,7 @@ class CRM_Core_Invoke {
     ) {
       CRM_Core_DAO::triggerRebuild();
     }
-
+    CRM_Core_DAO_AllCoreTables::reinitializeCache(TRUE);
     CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();
   }
 }

diff --git a/xml/templates/listAll.tpl b/xml/templates/listAll.tpl
index 82fa900b7ebc7853479ef7fbb052b71fdf8a6abf..58359c00ccdff12ea7b4ced423cb69a1c5f7c6c9 100644 (file)
--- a/xml/templates/listAll.tpl
+++ b/xml/templates/listAll.tpl
@@ -39,9 +39,9 @@ class CRM_Core_DAO_AllCoreTables {ldelim}
   static private $tables = null;
   static private $daoToClass = null;
 
-  static private function init() {ldelim}
+  static private function init($fresh = FALSE) {ldelim}
     static $init = FALSE;
-    if ($init) return;
+    if ($init && !$fresh) return;
 
     $entityTypes = array(
 {foreach from=$tables key=tableName item=table}
@@ -115,5 +115,8 @@ class CRM_Core_DAO_AllCoreTables {ldelim}
     return array_search(self::getCanonicalClassName($className), self::tables());
   {rdelim}
 
+  static public function reinitializeCache($fresh = FALSE) {ldelim}
+    self::init($fresh);
+  {rdelim}
 
 {rdelim}