From: yashodha Date: Mon, 13 Jun 2016 11:15:21 +0000 (+0530) Subject: minor fixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=19780fb879481561929f60841cff574d28e964fa;p=civicrm-core.git minor fixes --- diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php index dda4410cc9..477a4e60ac 100644 --- a/CRM/Member/BAO/Query.php +++ b/CRM/Member/BAO/Query.php @@ -252,7 +252,7 @@ class CRM_Member_BAO_Query { return; case 'member_test': - // We dont want to include all tests for sql OR CRM-7827 + // We don't want to include all tests for sql OR CRM-7827 if (!$value || $query->getOperator() != 'OR') { $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_membership.is_test", $op, $value, "Boolean"); if ($value) { @@ -279,7 +279,7 @@ class CRM_Member_BAO_Query { ), "Integer"); $query->_qill[$grouping][] = ts("Membership is Auto-Renew and In Progress"); - } + } elseif ($value == 3) { $query->_where[$grouping][] = " civicrm_membership.contribution_recur_id IS NOT NULL"; $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause( @@ -291,7 +291,7 @@ class CRM_Member_BAO_Query { ), "Integer"); $query->_qill[$grouping][] = ts("Membership is Auto-Renew and Failed"); - } + } elseif ($value == 4) { $query->_where[$grouping][] = " civicrm_membership.contribution_recur_id IS NOT NULL"; $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause( @@ -304,7 +304,7 @@ class CRM_Member_BAO_Query { "Integer" ); $query->_qill[$grouping][] = ts("Membership is Auto-Renew and Cancelled"); - } + } elseif ($value == 5) { $query->_where[$grouping][] = " civicrm_membership.contribution_recur_id IS NOT NULL"; $query->_where[$grouping][] = " ccr.end_date IS NOT NULL AND ccr.end_date < NOW()";