projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3e7a1d
)
CRM-15215 - Fix api address validation
author
Coleman Watts
<coleman@civicrm.org>
Mon, 1 Sep 2014 12:50:06 +0000
(13:50 +0100)
committer
Coleman Watts
<coleman@civicrm.org>
Mon, 1 Sep 2014 12:50:06 +0000
(13:50 +0100)
CRM/Core/BAO/Address.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/BAO/Address.php
b/CRM/Core/BAO/Address.php
index 5285d7811c551261ff366ab3470108ff34f5a877..4482d3b5d20a674cd8e19c028cc6a2e008c376b8 100644
(file)
--- a/
CRM/Core/BAO/Address.php
+++ b/
CRM/Core/BAO/Address.php
@@
-1185,7
+1185,7
@@
SELECT is_primary,
$props['country_id'] = $config->defaultContactCountry;
}
}
- if (!empty($props['country_id'])) {
+ if (!empty($props['country_id'])
&& $context !== 'validate'
) {
$params['condition'] = 'country_id IN (' . implode(',', (array) $props['country_id']) . ')';
}
break;
@@
-1207,4
+1207,4
@@
SELECT is_primary,
}
return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context);
}
-}
\ No newline at end of file
+}