fix for month case in generate recursion
authorunknown <priyanka.karan26@gmail.com>
Mon, 8 Sep 2014 13:34:18 +0000 (14:34 +0100)
committerdeepak-srivastava <deepak.srivastava.0303@gmail.com>
Fri, 3 Oct 2014 08:55:17 +0000 (09:55 +0100)
CRM/Core/BAO/RecurringEntity.php

index 328c30133478b21dbac49bc96a8cceb4bbc9778e..a0c1111a6256aa7bf87d92ee0b7aca9da995edd6 100644 (file)
@@ -350,9 +350,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
       //month 
       if($scheduleReminderDetails['repetition_frequency_unit'] == 'month'){
-        if($scheduleReminderDetails['limit_to']){
-          $r->bymonthday(array($scheduleReminderDetails['limit_to']));
-        }
         if($scheduleReminderDetails['start_action_date']){
           $startActionDate = explode(" ", $scheduleReminderDetails['start_action_date']);
           switch ($startActionDate[0]) {
@@ -374,6 +371,8 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
           }
           $concatStartActionDateBits = $startActionDate1.strtoupper(substr($startActionDate[1], 0, 2));
           $r->byday(array($concatStartActionDateBits));
+        }else if($scheduleReminderDetails['limit_to']){
+          $r->bymonthday(array($scheduleReminderDetails['limit_to']));
         }
       }