projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual merge of fixes for CRM-13981
[civicrm-core.git]
/
CRM
/
Contribute
/
Form
/
UpdateBilling.php
diff --git
a/CRM/Contribute/Form/UpdateBilling.php
b/CRM/Contribute/Form/UpdateBilling.php
index 56479a32a52a4f55e3b24d8abb5ba11d8b670d50..88d4f22c69cad124f86ecffc20ca40fd327d8680 100644
(file)
--- a/
CRM/Contribute/Form/UpdateBilling.php
+++ b/
CRM/Contribute/Form/UpdateBilling.php
@@
-109,7
+109,7
@@
class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form {
$this->assign('paymentProcessor', $this->_paymentProcessor);
// get the billing location type
$this->assign('paymentProcessor', $this->_paymentProcessor);
// get the billing location type
- $locationTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
+ $locationTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id'
, array(), 'validate'
);
$this->_bltID = array_search('Billing', $locationTypes);
$this->assign('bltID', $this->_bltID);
if (!$this->_bltID) {
$this->_bltID = array_search('Billing', $locationTypes);
$this->assign('bltID', $this->_bltID);
if (!$this->_bltID) {
@@
-163,7
+163,7
@@
class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form {
$config = CRM_Core_Config::singleton();
// set default country from config if no country set
$config = CRM_Core_Config::singleton();
// set default country from config if no country set
- if (
!CRM_Utils_Array::value("billing_country_id-{$this->_bltID}", $this->_defaults
)) {
+ if (
empty($this->_defaults["billing_country_id-{$this->_bltID}"]
)) {
$this->_defaults["billing_country_id-{$this->_bltID}"] = $config->defaultContactCountry;
}
$this->_defaults["billing_country_id-{$this->_bltID}"] = $config->defaultContactCountry;
}
@@
-176,7
+176,7
@@
class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form {
/**
* Function to build the form
*
/**
* Function to build the form
*
- * @return
None
+ * @return
void
* @access public
*/
public function buildQuickForm() {
* @access public
*/
public function buildQuickForm() {
@@
-317,7
+317,7
@@
class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form {
// format new billing name
$name = $processorParams['first_name'];
// format new billing name
$name = $processorParams['first_name'];
- if (
CRM_Utils_Array::value('middle_name', $processorParams
)) {
+ if (
!empty($processorParams['middle_name']
)) {
$name .= " {$processorParams['middle_name']}";
}
$name .= ' ' . $processorParams['last_name'];
$name .= " {$processorParams['middle_name']}";
}
$name .= ' ' . $processorParams['last_name'];
@@
-326,7
+326,7
@@
class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form {
// format old billing name
$name = $this->_defaults['first_name'];
// format old billing name
$name = $this->_defaults['first_name'];
- if (
CRM_Utils_Array::value('middle_name', $this->_defaults
)) {
+ if (
!empty($this->_defaults['middle_name']
)) {
$name .= " {$this->_defaults['middle_name']}";
}
$name .= ' ' . $this->_defaults['last_name'];
$name .= " {$this->_defaults['middle_name']}";
}
$name .= ' ' . $this->_defaults['last_name'];
@@
-400,7
+400,7
@@
class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form {
'toName' => $donorDisplayName,
'toEmail' => $donorEmail,
);
'toName' => $donorDisplayName,
'toEmail' => $donorEmail,
);
- list($sent) = CRM_Core_BAO_MessageTemplate
s
::sendTemplate($sendTemplateParams);
+ list($sent) = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
}
else {
$status = ts('There was some problem updating the billing details.');
}
else {
$status = ts('There was some problem updating the billing details.');