Merge pull request #23893 from eileenmcnaughton/user_two

[civicrm-core.git] / CRM / Member / Form / MembershipType.php

diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php
index a5c3c7d06dc50f931126f63feb395072986f36ec..e715fe35c09a2141b90e397748025eaa9cab3872 100644 (file)
--- a/CRM/Member/Form/MembershipType.php
+++ b/CRM/Member/Form/MembershipType.php
@@ -294,11 +294,7 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form_MembershipConfig {
     $this->addFormRule(['CRM_Member_Form_MembershipType', 'formRule']);
 
     $this->assign('membershipTypeId', $this->_id);
-
-    if (Civi::settings()->get('deferred_revenue_enabled')) {
-      $deferredFinancialType = CRM_Financial_BAO_FinancialAccount::getDeferredFinancialType();
-      $this->assign('deferredFinancialType', array_keys($deferredFinancialType));
-    }
+    $this->assign('deferredFinancialType', Civi::settings()->get('deferred_revenue_enabled') ? array_keys(CRM_Financial_BAO_FinancialAccount::getDeferredFinancialType()) : NULL);
   }
 
   /**
@@ -364,14 +360,14 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form_MembershipConfig {
     }
 
     if ($params['fixed_period_start_day'] && !empty($params['fixed_period_start_day'])) {
-      $params['fixed_period_start_day']['Y'] = date('Y');
+      $params['fixed_period_start_day']['Y'] = CRM_Utils_Time::date('Y');
       if (!CRM_Utils_Rule::qfDate($params['fixed_period_start_day'])) {
         $errors['fixed_period_start_day'] = ts('Please enter valid Fixed Period Start Day');
       }
     }
 
     if ($params['fixed_period_rollover_day'] && !empty($params['fixed_period_rollover_day'])) {
-      $params['fixed_period_rollover_day']['Y'] = date('Y');
+      $params['fixed_period_rollover_day']['Y'] = CRM_Utils_Time::date('Y');
       if (!CRM_Utils_Rule::qfDate($params['fixed_period_rollover_day'])) {
         $errors['fixed_period_rollover_day'] = ts('Please enter valid Fixed Period Rollover Day');
       }