Merge pull request #1625 from pradpnayak/CRM-13340

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

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 4d760c6f09af8f60447fb6c0b1c8027a262e3c1d..e70c88fd45f46e27fa297064d2cbe88eb9ff9a5c 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -420,6 +420,9 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
 
       $billingDefaults = $this->getProfileDefaults('Billing', $this->_contactID);
       $defaults = array_merge($defaults, $billingDefaults);
+
+      // now fix all state country selectors, set correct state based on country
+      CRM_Core_BAO_Address::fixAllStateSelects($this, $defaults);
       
       //             // hack to simplify credit card entry for testing
       //             $defaults['credit_card_type']     = 'Visa';
@@ -1830,7 +1833,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
       }
     }
 
-    list($mailSend, $subject, $message, $html) = CRM_Core_BAO_MessageTemplates::sendTemplate(
+    list($mailSend, $subject, $message, $html) = CRM_Core_BAO_MessageTemplate::sendTemplate(
       array(
         'groupName' => 'msg_tpl_workflow_membership',
         'valueName' => 'membership_offline_receipt',