From: Donald A. Lobo Date: Mon, 11 Mar 2013 18:01:20 +0000 (-0700) Subject: fix CRM-12093 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fd0bc4709d3eef8f88e74c87e36c5653ee8a8931;p=civicrm-core.git fix CRM-12093 --- diff --git a/CRM/Core/Block.php b/CRM/Core/Block.php index aa2017d122..f7312269ac 100644 --- a/CRM/Core/Block.php +++ b/CRM/Core/Block.php @@ -166,7 +166,7 @@ class CRM_Core_Block { 'info' => ts('CiviCRM Full-text Search'), 'subject' => ts('Full-text Search'), 'active' => TRUE, - 'cache' => BLOCK_CACHE_GLOBAL, + 'cache' => BLOCK_NO_CACHE, 'visibility' => 1, 'weight' => -94, 'status' => 0, @@ -361,7 +361,7 @@ class CRM_Core_Block { if (!empty($config->enableComponents)) { // check if we can process credit card contribs $newCredit = CRM_Core_Payment::allowBackofficeCreditCard(); - + foreach ($components as $componentName => $obj) { if (in_array($componentName, $config->enableComponents)) { eval('$obj->creatNewShortcut( $shortCuts, $newCredit );'); diff --git a/templates/CRM/Block/FullTextSearch.tpl b/templates/CRM/Block/FullTextSearch.tpl index c402b61041..c15b9dd685 100644 --- a/templates/CRM/Block/FullTextSearch.tpl +++ b/templates/CRM/Block/FullTextSearch.tpl @@ -41,6 +41,7 @@