Function optimization and js fix

diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
index a93f88e7bbee943004842501557c73d9456c4dfa..5213e9498522549b9570ce8a0df17be37ac6af66 100644 (file)
--- 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 86afc4e463af0ae0714a6699f6427dae0fad0729..00867862406316dad4a4dfe6a3df073f532bcb6b 100644 (file)
--- 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);