+--------------------------------------------------------------------+
| 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
*/
/**
// we allow the controller to set force/reset externally, useful when we are being
// 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');
'activity_type_id',
'status_id',
'activity_subject',
+ 'activity_details',
);
$changeNames = array('status_id' => 'activity_status_id');
CRM_Contact_BAO_Query::processSpecialFormValue($this->_formValues, $specialParams, $changeNames);
$this->_defaults['activity_status_id'] = $status;
}
- $survey = CRM_Utils_Request::retrieve('survey', 'Positive', CRM_Core_DAO::$_nullObject);
+ $survey = CRM_Utils_Request::retrieve('survey', 'Positive');
if ($survey) {
$this->_formValues['activity_survey_id'] = $this->_defaults['activity_survey_id'] = $survey;
// Added for membership search
- $signupType = CRM_Utils_Request::retrieve('signupType', 'Positive',
- CRM_Core_DAO::$_nullObject
- );
+ $signupType = CRM_Utils_Request::retrieve('signupType', 'Positive');
if ($signupType) {
$this->_formValues['activity_role'] = 1;
}
}
- $dateLow = CRM_Utils_Request::retrieve('dateLow', 'String',
- CRM_Core_DAO::$_nullObject
- );
+ $dateLow = CRM_Utils_Request::retrieve('dateLow', 'String');
if ($dateLow) {
$dateLow = date('m/d/Y', strtotime($dateLow));
$this->_defaults['activity_date_low'] = $dateLow;
}
- $dateHigh = CRM_Utils_Request::retrieve('dateHigh', 'String',
- CRM_Core_DAO::$_nullObject
- );
+ $dateHigh = CRM_Utils_Request::retrieve('dateHigh', 'String');
if ($dateHigh) {
// Activity date time assumes midnight at the beginning of the date