From 9d2af82701292db5273fccd77d31bd6f5b3fde4b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 Sep 2014 16:20:42 +0100 Subject: [PATCH] Function optimization and js fix --- CRM/Core/BAO/RecurringEntity.php | 2 +- templates/CRM/Core/Form/RecurringEntity.tpl | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php index a93f88e7bb..5213e94985 100644 --- a/CRM/Core/BAO/RecurringEntity.php +++ b/CRM/Core/BAO/RecurringEntity.php @@ -432,7 +432,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { static public function generateRecursions($recursionObj, $params = array(), $excludeDates = array()) { $newParams = $recursionResult = array(); - if ($recursionObj && !empty($params)) { + if (is_a($recursionObj, 'When')) { $initialCount = CRM_Utils_Array::value('start_action_offset', $params); $interval = CRM_Utils_Array::value('interval', $params); diff --git a/templates/CRM/Core/Form/RecurringEntity.tpl b/templates/CRM/Core/Form/RecurringEntity.tpl index 86afc4e463..0086786240 100644 --- a/templates/CRM/Core/Form/RecurringEntity.tpl +++ b/templates/CRM/Core/Form/RecurringEntity.tpl @@ -320,7 +320,6 @@ } } if(warningHtml != ""){ - cj('button span.ui-button-text:contains("Ok")').hide(); cj('#generated_dates').append(warningHtml).append(html); }else{ cj('#generated_dates').html(html); -- 2.25.1