}
}
}
- } else {
+ }
+ else {
foreach ($this->_fields as $name => $field) {
if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($name)) {
$htmlType = $field['html_type'];
if ($htmlType == 'File') {
$entityId = $this->_id;
- if (CRM_Utils_Array::value('field_type', $field) == 'Activity' &&
- $this->_activityId
- ) {
+ if (CRM_Utils_Array::value('field_type', $field) == 'Activity' && $this->_activityId) {
$entityId = $this->_activityId;
}
$url = CRM_Core_BAO_CustomField::getFileURL($entityId, $customFieldID);
$this->assign("imageThumbWidth", $imageThumbWidth);
$this->assign("imageThumbHeight", $imageThumbHeight);
$this->assign("imageURL", $this->_defaults['image_URL']);
+ $this->removeFileRequiredRules('image_URL');
}
if (array_key_exists('contact_sub_type', $this->_defaults) &&
return FALSE;
}
+ if (count($this->_submitValues)) {
+ $location_type_id = null;
+ foreach ($this->_fields as $field) {
+ if (!empty($field['location_type_id'])) {
+ $location_type_id = $field['location_type_id'];
+ }
+ if (array_key_exists("country-{$location_type_id}", $this->_fields) &&
+ array_key_exists("state_province-{$location_type_id}", $this->_fields) &&
+ !empty($this->_submitValues["country-{$location_type_id}"])) {
+ $this->_fields["state_province-{$location_type_id}"]['is_required'] =
+ CRM_Core_Payment_Form::checkRequiredStateProvince($this, "country-{$location_type_id}");
+ }
+ }
+ }
+
$this->assign('id', $this->_id);
$this->assign('mode', $this->_mode);
$this->assign('action', $this->_action);
$params['contactID'] = $this->_id;
if (!CRM_Core_BAO_CMSUser::create($params, $this->_mail)) {
CRM_Core_Session::setStatus(ts('Your profile is not saved and Account is not created.'), ts('Profile Error'), 'error');
+ CRM_Core_Error::debug_log_message("Rolling back transaction as CMSUser Create failed in Profile_Form for contact " . $params['contactID']);
$transaction->rollback();
return CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/profile/create',
'reset=1&gid=' . $this->_gid