projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright date for 2020
[civicrm-core.git]
/
CRM
/
Contact
/
Form
/
Task
/
ProximityCommon.php
diff --git
a/CRM/Contact/Form/Task/ProximityCommon.php
b/CRM/Contact/Form/Task/ProximityCommon.php
index 6f632cb9de6e3741aa1a2dc845d05c00dac8a559..dfcfdd34beab49123b4ea22bc3b434364fb29c7e 100644
(file)
--- a/
CRM/Contact/Form/Task/ProximityCommon.php
+++ b/
CRM/Contact/Form/Task/ProximityCommon.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-20
19
|
+ | Copyright CiviCRM LLC (c) 2004-20
20
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-20
19
+ * @copyright CiviCRM LLC (c) 2004-20
20
*/
/**
*/
/**
@@
-107,9
+107,7
@@
class CRM_Contact_Form_Task_ProximityCommon {
if (empty($fields['prox_state_province_id']) || empty($fields['prox_country_id'])) {
$errors["prox_state_province_id"] = ts("Country AND State/Province are required to search by distance.");
}
if (empty($fields['prox_state_province_id']) || empty($fields['prox_country_id'])) {
$errors["prox_state_province_id"] = ts("Country AND State/Province are required to search by distance.");
}
- if (!CRM_Utils_Array::value('prox_postal_code', $fields) and
- !CRM_Utils_Array::value('prox_city', $fields)
- ) {
+ if (empty($fields['prox_postal_code']) && empty($fields['prox_city'])) {
$errors["prox_distance"] = ts("City OR Postal Code are required to search by distance.");
}
}
$errors["prox_distance"] = ts("City OR Postal Code are required to search by distance.");
}
}