Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old stuff #16835

Merged
merged 3 commits into from
Mar 19, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove deprecated report functions
  • Loading branch information
colemanw committed Mar 18, 2020
commit 0b546455dfe04714e10711f7a7b9b937ea4a4000
40 changes: 0 additions & 40 deletions CRM/Report/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -4653,46 +4653,6 @@ public function fiscalYearOffset($fieldName) {
($fy['d'] > 1 ? (" - INTERVAL " . ($fy['d'] - 1) . " DAY") : '') . " )";
}

/**
* Add Address into From Table if required.
*
* @deprecated use joinAddressFromContact
* (left here in case extensions use it).
*/
public function addAddressFromClause() {
CRM_Core_Error::deprecatedFunctionWarning('CRM_Report_Form::joinAddressFromContact');
// include address field if address column is to be included
if ((isset($this->_addressField) &&
$this->_addressField
) ||
$this->isTableSelected('civicrm_address')
) {
$this->_from .= "
LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
ON ({$this->_aliases['civicrm_contact']}.id =
{$this->_aliases['civicrm_address']}.contact_id) AND
{$this->_aliases['civicrm_address']}.is_primary = 1\n";
}
}

/**
* Add Phone into From Table if required.
*
* @deprecated use joinPhoneFromContact
* (left here in case extensions use it).
*/
public function addPhoneFromClause() {
CRM_Core_Error::deprecatedFunctionWarning('CRM_Report_Form::joinPhoneFromContact');
// include address field if address column is to be included
if ($this->isTableSelected('civicrm_phone')) {
$this->_from .= "
LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
ON ({$this->_aliases['civicrm_contact']}.id =
{$this->_aliases['civicrm_phone']}.contact_id) AND
{$this->_aliases['civicrm_phone']}.is_primary = 1\n";
}
}

/**
* Add Address into From Table if required.
*
Expand Down