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 #9375 from JMAConsulting/CRM-19636
[civicrm-core.git]
/
CRM
/
Report
/
Form.php
diff --git
a/CRM/Report/Form.php
b/CRM/Report/Form.php
index 821394aff4593906a9b8ade8f3576b5f24fc72a9..de0ad122ad2921679a4b411027f07d64bbfbbe7d 100644
(file)
--- a/
CRM/Report/Form.php
+++ b/
CRM/Report/Form.php
@@
-524,21
+524,11
@@
class CRM_Report_Form extends CRM_Core_Form {
* @throws \Exception
*/
public function preProcessCommon() {
* @throws \Exception
*/
public function preProcessCommon() {
- $this->_force
- = CRM_Utils_Request::retrieve(
- 'force',
- 'Boolean',
- CRM_Core_DAO::$_nullObject
- );
+ $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean');
- $this->_dashBoardRowCount
- = CRM_Utils_Request::retrieve(
- 'rowCount',
- 'Integer',
- CRM_Core_DAO::$_nullObject
- );
+ $this->_dashBoardRowCount = CRM_Utils_Request::retrieve('rowCount', 'Integer');
- $this->_section = CRM_Utils_Request::retrieve('section', 'Integer'
, CRM_Core_DAO::$_nullObject
);
+ $this->_section = CRM_Utils_Request::retrieve('section', 'Integer');
$this->assign('section', $this->_section);
CRM_Core_Region::instance('page-header')->add(array(
$this->assign('section', $this->_section);
CRM_Core_Region::instance('page-header')->add(array(
@@
-3329,7
+3319,7
@@
WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
if ($this->addPaging) {
$this->_select = str_ireplace('SELECT ', 'SELECT SQL_CALC_FOUND_ROWS ', $this->_select);
if ($this->addPaging) {
$this->_select = str_ireplace('SELECT ', 'SELECT SQL_CALC_FOUND_ROWS ', $this->_select);
- $pageId = CRM_Utils_Request::retrieve('crmPID', 'Integer'
, CRM_Core_DAO::$_nullObject
);
+ $pageId = CRM_Utils_Request::retrieve('crmPID', 'Integer');
// @todo all http vars should be extracted in the preProcess
// - not randomly in the class
// @todo all http vars should be extracted in the preProcess
// - not randomly in the class
@@
-4097,6
+4087,7
@@
LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
);
}
);
}
+ $street_address_filters = $general_address_filters = array();
if ($filters) {
// Address filter depends on whether street address parsing is enabled.
// (CRM-18696)
if ($filters) {
// Address filter depends on whether street address parsing is enabled.
// (CRM-18696)