<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.6 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
*/
/**
*/
protected $_limit = NULL;
- protected $_defaults;
-
/**
* Prefix for the controller.
*/
* driven by the wizard framework
*/
- $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject);
+ $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean');
$this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE);
$this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this);
$this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search');
'contribution_status_id',
'contribution_source',
'contribution_trxn_id',
+ 'contribution_page_id',
+ 'contribution_product_id',
'invoice_id',
+ 'payment_instrument_id',
);
- foreach ($specialParams as $element) {
- $value = CRM_Utils_Array::value($element, $this->_formValues);
- if ($value) {
- if (is_array($value)) {
- $this->_formValues[$element] = array('IN' => $value);
- }
- else {
- $this->_formValues[$element] = array('LIKE' => "%$value%");
- }
- }
- }
+ CRM_Contact_BAO_Query::processSpecialFormValue($this->_formValues, $specialParams);
$tags = CRM_Utils_Array::value('contact_tags', $this->_formValues);
if ($tags && !is_array($tags)) {
}
}
- if (!$config->groupTree) {
+ if (!defined('CIVICRM_GROUPTREE')) {
$group = CRM_Utils_Array::value('group', $this->_formValues);
if ($group && !is_array($group)) {
unset($this->_formValues['group']);