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 #4627 from colemanw/docblocks
[civicrm-core.git]
/
CRM
/
Member
/
BAO
/
Query.php
diff --git
a/CRM/Member/BAO/Query.php
b/CRM/Member/BAO/Query.php
index 6bcb8008327c94ebac057d3afbc934a1815f4256..52689ebe2e1812348d508474e5c363eb01b9f2fa 100644
(file)
--- a/
CRM/Member/BAO/Query.php
+++ b/
CRM/Member/BAO/Query.php
@@
-253,11
+253,9
@@
class CRM_Member_BAO_Query {
$query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause(
"ccr.contribution_status_id",
$op,
$query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause(
"ccr.contribution_status_id",
$op,
- CRM_Core_DAO::getFieldValue(
- 'CRM_Core_DAO_OptionValue',
- 'Cancelled',
- 'value',
- 'name'
+ array_search(
+ 'Cancelled',
+ CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name')
),
"Integer"
);
),
"Integer"
);
@@
-435,7
+433,7
@@
class CRM_Member_BAO_Query {
}
/**
}
/**
- * @param $form
+ * @param
CRM_Core_Form
$form
*/
static function buildSearchForm(&$form) {
foreach (CRM_Member_PseudoConstant::membershipType() as $id => $Name) {
*/
static function buildSearchForm(&$form) {
foreach (CRM_Member_PseudoConstant::membershipType() as $id => $Name) {