projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3927 from eileenmcnaughton/CRM-15168
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
UFGroup.php
diff --git
a/CRM/Core/BAO/UFGroup.php
b/CRM/Core/BAO/UFGroup.php
index 68996800464f7e200e8529ffeb7d0cd780ca768a..478501d45242a61871a81626f371f97d63a248c6 100644
(file)
--- a/
CRM/Core/BAO/UFGroup.php
+++ b/
CRM/Core/BAO/UFGroup.php
@@
-958,7
+958,6
@@
class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup {
$websiteTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Website', 'website_type_id');
$multipleFields = array('url');
$websiteTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Website', 'website_type_id');
$multipleFields = array('url');
- $nullIndex = $nullValueIndex = ' ';
//start of code to set the default values
foreach ($fields as $name => $field) {
//start of code to set the default values
foreach ($fields as $name => $field) {
@@
-972,18
+971,12
@@
class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup {
continue;
}
continue;
}
+ // Create a unique, non-empty index for each field.
$index = $field['title'];
$index = $field['title'];
- //handle for the label not set for the field
- if (empty($field['title'])) {
- $index = $nullIndex;
- $nullIndex .= $nullIndex;
- }
+ if ($index === '') $index = ' ';
+ while (array_key_exists($index, $values))
+ $index .= ' ';
- //handle the case to avoid re-write where the profile field labels are the same
- if (array_key_exists($index, $values)) {
- $index .= $nullValueIndex;
- $nullValueIndex .= $nullValueIndex;
- }
$params[$index] = $values[$index] = '';
$customFieldName = NULL;
// hack for CRM-665
$params[$index] = $values[$index] = '';
$customFieldName = NULL;
// hack for CRM-665
@@
-1149,7
+1142,7
@@
class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup {
}
}
elseif ($name == 'image_URL') {
}
}
elseif ($name == 'image_URL') {
- list($width, $height) = getimagesize(
$details->$name
);
+ list($width, $height) = getimagesize(
CRM_Utils_String::unstupifyUrl($details->$name)
);
list($thumbWidth, $thumbHeight) = CRM_Contact_BAO_Contact::getThumbSize($width, $height);
$image_URL = '<img src="' . $details->$name . '" height= ' . $thumbHeight . ' width= ' . $thumbWidth . ' />';
list($thumbWidth, $thumbHeight) = CRM_Contact_BAO_Contact::getThumbSize($width, $height);
$image_URL = '<img src="' . $details->$name . '" height= ' . $thumbHeight . ' width= ' . $thumbWidth . ' />';
@@
-1861,8
+1854,7
@@
AND ( entity_id IS NULL OR entity_id <= 0 )
elseif (substr($fieldName, 0, 6) === 'county') {
if ($addressOptions['county']) {
$form->add('select', $name, $title,
elseif (substr($fieldName, 0, 6) === 'county') {
if ($addressOptions['county']) {
$form->add('select', $name, $title,
- array(
- '' => ts('(choose state first)')), $required
+ array('' => ts('Choose state first')), $required
);
}
}
);
}
}
@@
-2325,6
+2317,9
@@
AND ( entity_id IS NULL OR entity_id <= 0 )
}
}
}
}
}
}
+ elseif ($name == 'contact_sub_type') {
+ $defaults[$fldName] = explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($details[$name], CRM_Core_DAO::VALUE_SEPARATOR));
+ }
elseif ($name == 'world_region') {
$defaults[$fldName] = $details['worldregion_id'];
}
elseif ($name == 'world_region') {
$defaults[$fldName] = $details['worldregion_id'];
}