jenkins-bot has submitted this change and it was merged.
Change subject: Fix e-strict errors
......................................................................
Fix e-strict errors
Alter report class function signatures to match the parent
Bug: T99836
Change-Id: I164b38cb0bf07ee69ad179b4e053951fb9e94efd
---
M
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index 3bef952..4610288 100644
---
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -182,7 +182,7 @@
parent::__construct( );
}
- function buildQuery() {
+ function buildQuery($applyLimit = true) {
return "/* timeout=600 */ " . parent::buildQuery();
}
@@ -205,7 +205,7 @@
\nLEFT JOIN civicrm_address
ON civicrm_address.contact_id =
{$this->_aliases['civicrm_contribution']}.contact_id
AND civicrm_address.is_primary = 1
-LEFT JOIN civicrm_country {$this->_aliases['civicrm_country']}
+LEFT JOIN civicrm_country {$this->_aliases['civicrm_country']}
ON {$this->_aliases['civicrm_country']}.id = civicrm_address.country_id
EOS;
}
@@ -254,12 +254,12 @@
and array_key_exists( $field_name, $this->_params['group_bys']
) );
}
- function addDateRange( $name, $from = '_from', $to = '_to', $label =
'From:', $dateFormat = 'searchDate', $required = false ) {
+ function addDateRange( $name, $from = '_from', $to = '_to', $label =
'From:', $dateFormat = 'searchDate', $required = false, $displayTime = false ) {
$this->addDateTime( $name . $from, $label , $required, array(
'formatType' => $dateFormat ) );
$this->addDateTime( $name . $to, ts('To:'), $required, array(
'formatType' => $dateFormat ) );
}
- function selectClause( $tableName, $type, $fieldName, &$field ) {
+ function selectClause( &$tableName, $type, &$fieldName, &$field ) {
switch ( $fieldName ) {
case 'is_negative':
$this->register_field_alias( $tableName, $fieldName, $field );
--
To view, visit https://gerrit.wikimedia.org/r/247462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I164b38cb0bf07ee69ad179b4e053951fb9e94efd
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: civi-4.6.9
Gerrit-Owner: Eileen <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
