Fix inconsistent use of property_exists

diff --git a/CRM/Price/BAO/Field.php b/CRM/Price/BAO/Field.php
index 435585412928e7149f0054d99d38b6651b280f77..079fe21afa99c958beb31109eac0073ccb67bcc6 100644 (file)
--- a/CRM/Price/BAO/Field.php
+++ b/CRM/Price/BAO/Field.php
@@ -259,7 +259,7 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
     $currencyName = $config->defaultCurrency;
 
     if (!isset($label)) {
-      $label = (property_exists($qf,'_membershipBlock') && $field->name == 'contribution_amount') ? ts('Additional Contribution') : $field->label;
+      $label = (!empty($qf->_membershipBlock) && $field->name == 'contribution_amount') ? ts('Additional Contribution') : $field->label;
     }
 
     if ($field->name == 'contribution_amount') {
@@ -286,7 +286,7 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
         $priceVal  = implode($seperator, array($customOption[$optionKey][$valueFieldName], $count, $max_value));
 
         $extra = array();
-        if (property_exists($qf,'_quickConfig') && $qf->_quickConfig && property_exists($qf,'_contributionAmount') && $qf->_contributionAmount) {
+        if (!empty($qf->_quickConfig) && !empty($qf->_contributionAmount)) {
           foreach($fieldOptions as &$fieldOption) {
             if ($fieldOption['name'] == 'other_amount') {
               $fieldOption['label'] = $fieldOption['label'] . '  ' . $currencySymbol;
@@ -294,11 +294,10 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
           }
           $qf->assign('priceset', $elementName);
           $extra = array('onclick' => 'useAmountOther();');
-
         }
 
         // if seperate membership payment is used with quick config priceset then change the other amount label
-        if (property_exists($qf,'_membershipBlock') && $qf->_quickConfig && $field->name == 'other_amount' && !property_exists($qf,'_contributionAmount')) {
+        if (!empty($qf->_membershipBlock) && !empty($qf->_quickConfig) && $field->name == 'other_amount' && empty($qf->_contributionAmount)) {
           $label = ts('Additional Contribution');
           $useRequired = 0;
         } 
@@ -324,7 +323,7 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
         }
 
         //CRM-10117
-        if (property_exists($qf, '_quickConfig') && $qf->_quickConfig) {
+        if (!empty($qf->_quickConfig)) {
           $message = ts('Please enter a valid amount.');
           $type = 'money';
         } 
@@ -339,7 +338,7 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
       case 'Radio':
         $choice = array();
 
-        if (property_exists($qf, '_quickConfig') && $qf->_quickConfig && property_exists($qf,'_contributionAmount') && $qf->_contributionAmount) {
+        if (!empty($qf->_quickConfig) && !empty($qf->_contributionAmount)) {
           $qf->assign('contriPriceset', $elementName);
         }
 
@@ -355,10 +354,10 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
                    'data-amount' => $opt[$valueFieldName],
                    'data-currency' => $currencyName,
           );
-          if (property_exists($qf, '_quickConfig') && $qf->_quickConfig && $field->name == 'contribution_amount') {
+          if (!empty($qf->_quickConfig) && $field->name == 'contribution_amount') {
             $extra += array('onclick' => 'clearAmountOther();');
           } 
-          elseif (property_exists($qf, '_quickConfig') && $qf->_quickConfig && $field->name == 'membership_amount') {
+          elseif (!empty($qf->_quickConfig) && $field->name == 'membership_amount') {
             $extra += array(
               'onclick' => "return showHideAutoRenew({$opt['membership_type_id']});",
               'membership-type' => $opt['membership_type_id'],
@@ -377,8 +376,7 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
             $choice[$opId]->freeze();
           }
         }
-        if (property_exists($qf, '_membershipBlock') && $qf->_membershipBlock 
-          && $field->name == 'contribution_amount') {
+        if (!empty($qf->_membershipBlock) && $field->name == 'contribution_amount') {
           $choice[] = $qf->createElement('radio', NULL, '', ts('No thank you'), '-1',
             array(
               'onclick' => 'clearAmountOther();',
@@ -391,7 +389,7 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
           if (CRM_Utils_Array::value('is_allow_other_amount', $otherAmount) && $field->name == 'contribution_amount') {
             $none = ts('Other Amount');
           } 
-          elseif (property_exists($qf, '_membershipBlock') && !CRM_Utils_Array::value('is_required', $qf->_membershipBlock) && $field->name == 'membership_amount') {
+          elseif (!empty($qf->_membershipBlock) && !CRM_Utils_Array::value('is_required', $qf->_membershipBlock) && $field->name == 'membership_amount') {
             $none = ts('No thank you');
           } 
           else {
@@ -407,7 +405,7 @@ class CRM_Price_BAO_Field extends CRM_Price_DAO_Field {
 
         // make contribution field required for quick config when membership block is enabled
         if (($field->name == 'membership_amount' || $field->name == 'contribution_amount')
-          && property_exists($qf, '_membershipBlock') && !empty($qf->_membershipBlock) && !$field->is_required) {
+          && !empty($qf->_membershipBlock) && !$field->is_required) {
           $useRequired = $field->is_required = TRUE;
         }