manual merge of fixes for CRM-13981

[civicrm-core.git] / CRM / Contribute / Form / AdditionalInfo.php

diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php
index 713f87066281298c6e53dceb45fbb39ef072fb6b..4b827a1f763e0a232718f42b6cb14ec27a9753c9 100644 (file)
--- a/CRM/Contribute/Form/AdditionalInfo.php
+++ b/CRM/Contribute/Form/AdditionalInfo.php
@@ -154,29 +154,6 @@ class CRM_Contribute_Form_AdditionalInfo {
 
   }
 
-  /**
-   * Function to build the form for Honoree Information.
-   *
-   * @access public
-   *
-   * @return void
-   */
-  static function buildHonoree(&$form) {
-    //Honoree section
-    $form->add('hidden', 'hidden_Honoree', 1);
-    $honor = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'honor_type_id');
-    $extraOption = array('onclick' => "return enableHonorType();");
-    foreach ($honor as $key => $var) {
-      $honorTypes[$key] = $form->createElement('radio', NULL, NULL, $var, $key, $extraOption);
-    }
-    $form->addGroup($honorTypes, 'honor_type_id', NULL);
-    $form->add('select', 'honor_prefix_id', ts('Prefix'), array('' => ts('- prefix -')) + CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id'));
-    $form->add('text', 'honor_first_name', ts('First Name'));
-    $form->add('text', 'honor_last_name', ts('Last Name'));
-    $form->add('text', 'honor_email', ts('Email'));
-    $form->addRule("honor_email", ts('Email is not valid.'), 'email');
-  }
-
   /**
    * This function is used by  CRM/Pledge/Form/Pledge.php
    *
@@ -293,7 +270,6 @@ class CRM_Contribute_Form_AdditionalInfo {
       'trxn_id',
       'invoice_id',
       'campaign_id',
-      'honor_type_id',
       'contribution_page_id',
     );
     foreach ($fields as $f) {
@@ -376,11 +352,8 @@ class CRM_Contribute_Form_AdditionalInfo {
         $params['product_name'] = $productDAO->name;
         $params['product_sku'] = $productDAO->sku;
 
-        if (empty($params['product_option']) &&
-          CRM_Utils_Array::value($params['product_name'][0],
-            $form->_options
-          )
-        ) {
+        if (empty($params['product_option']) && !empty($form->_options
+[$params['product_name'][0]])) {
           $params['product_option'] = $form->_options[$params['product_name'][0]][$params['product_name'][1]];
         }
       }