X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FInvoke.php;h=4c25c0f885a14ab036f37efad462fc9a9dabd674;hb=7e5524d42ce21bb4cd64cec30ad63b68d882c108;hp=4dd8b4c42beef82ebb37c121cabcbd2b0a06147a;hpb=3ceab82f752055bf47bc9337b512a123e94d0b20;p=civicrm-core.git

diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
index 4dd8b4c42b..4c25c0f885 100644
--- a/CRM/Core/Invoke.php
+++ b/CRM/Core/Invoke.php
@@ -57,6 +57,9 @@ class CRM_Core_Invoke {
     }
   }
 
+  /**
+   * @param $args
+   */
   protected static function _invoke($args) {
     if ($args[0] !== 'civicrm') {
       return;
@@ -260,9 +263,6 @@ class CRM_Core_Invoke {
       }
 
       if (isset($item['breadcrumb']) && !isset($item['is_public'])) {
-        foreach ($item['breadcrumb'] as &$breadcrumb) {
-          $breadcrumb['url'] = CRM_Utils_System::url($breadcrumb['url']);
-        }
         CRM_Utils_System::appendBreadCrumb($item['breadcrumb']);
       }
 
@@ -345,6 +345,9 @@ class CRM_Core_Invoke {
    *
    * @param $action
    *
+   * @param $contact_type
+   * @param $contact_sub_type
+   *
    * @static
    * @access public
    */
@@ -375,6 +378,12 @@ class CRM_Core_Invoke {
     $template->assign('newer_civicrm_version', $newerVersion);
   }
 
+  /**
+   * @param bool $triggerRebuild
+   * @param bool $sessionReset
+   *
+   * @throws Exception
+   */
   static function rebuildMenuAndCaches($triggerRebuild = FALSE, $sessionReset = FALSE) {
     $config = CRM_Core_Config::singleton();
     $config->clearModuleList();
@@ -390,11 +399,13 @@ class CRM_Core_Invoke {
     // also cleanup module permissions
     $config->cleanupPermissions();
 
-    // also rebuild word replacement cache
-    CRM_Core_BAO_WordReplacement::rebuild();
+    // rebuild word replacement cache - pass false to prevent operations redundant with this fn
+    CRM_Core_BAO_WordReplacement::rebuild(FALSE);
 
     CRM_Core_BAO_Setting::updateSettingsFromMetaData();
-    CRM_Core_Resources::singleton()->resetCacheCode();
+    // Clear js caches
+    CRM_Core_Resources::singleton()->flushStrings()->resetCacheCode();
+    CRM_Case_XMLRepository::singleton(TRUE);
 
     // also rebuild triggers if requested explicitly
     if (
@@ -407,4 +418,3 @@ class CRM_Core_Invoke {
     CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();
   }
 }
-