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 #18717 from eileenmcnaughton/static2
[civicrm-core.git]
/
CRM
/
Contact
/
Selector.php
diff --git
a/CRM/Contact/Selector.php
b/CRM/Contact/Selector.php
index f2fd42a7e20f61fa81663ce1136e5d66e13122ab..2296ddd2e43c8d7c262ea4055119131fbe5b206f 100644
(file)
--- a/
CRM/Contact/Selector.php
+++ b/
CRM/Contact/Selector.php
@@
-61,6
+61,7
@@
class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
'status',
'do_not_email',
'do_not_phone',
'status',
'do_not_email',
'do_not_phone',
+ 'do_not_sms',
'do_not_mail',
];
'do_not_mail',
];
@@
-805,9
+806,7
@@
class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
);
}
elseif ((is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) ||
);
}
elseif ((is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) ||
- (!empty($row['city']) &&
- CRM_Utils_Array::value('state_province', $row)
- )
+ (!empty($row['city']) && !empty($row['state_province']))
) {
$row['action'] = CRM_Core_Action::formLink(
$links,
) {
$row['action'] = CRM_Core_Action::formLink(
$links,
@@
-935,9
+934,7
@@
class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
}
if ((!is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) &&
}
if ((!is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) &&
- (empty($row['city']) ||
- !CRM_Utils_Array::value('state_province', $row)
- )
+ (empty($row['city']) || empty($row['state_province']))
) {
$mask = $mask & 4095;
}
) {
$mask = $mask & 4095;
}