Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52

[civicrm-core.git] / CRM / Financial / BAO / PaymentProcessorType.php

diff --git a/CRM/Financial/BAO/PaymentProcessorType.php b/CRM/Financial/BAO/PaymentProcessorType.php
index 23e27696b9c0b70eff082dceae8c2c46f0286830..055b5f248b565d3256b535f05d891d7a12908872 100644 (file)
--- a/CRM/Financial/BAO/PaymentProcessorType.php
+++ b/CRM/Financial/BAO/PaymentProcessorType.php
@@ -206,6 +206,11 @@ WHERE pp.payment_processor_type_id = ppt.id AND ppt.id = %1";
     }
   }
 
+  /**
+   * @param $attr
+   *
+   * @return array
+   */
   static private function getAllPaymentProcessorTypes($attr) {
     $ppt = array();
     $dao = new CRM_Financial_DAO_PaymentProcessorType();
@@ -216,29 +221,5 @@ WHERE pp.payment_processor_type_id = ppt.id AND ppt.id = %1";
     return $ppt;
   }
 
-  /**
-   * Get options for a given field.
-   * @see CRM_Core_DAO::buildOptions
-   *
-   * @param String $fieldName
-   * @param String $context : @see CRM_Core_DAO::buildOptionsContext
-   * @param Array $props : whatever is known about this dao object
-   *
-   * @return Array|bool
-   */
-  public static function buildOptions($fieldName, $context = NULL, $props = array()) {
-    $params = array();
-    // Special logic for fields whose options depend on context or properties
-    switch ($fieldName) {
-      // These options are not in the db
-      case 'billing_mode':
-        return array(
-          CRM_Core_Payment::BILLING_MODE_FORM => 'form',
-          CRM_Core_Payment::BILLING_MODE_BUTTON => 'button',
-          CRM_Core_Payment::BILLING_MODE_NOTIFY => 'notify',
-        );
-    }
-    return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context);
-  }
 }