Merge branch '4.7.21-rc' into master

[civicrm-core.git] / Civi / Token / AbstractTokenSubscriber.php

diff --git a/Civi/Token/AbstractTokenSubscriber.php b/Civi/Token/AbstractTokenSubscriber.php
index 1164032de84c384de0cb3d938fef5fd2c50829f5..450955bfd5b0b3cf43a96beebb5625b3f71990c6 100644 (file)
--- a/Civi/Token/AbstractTokenSubscriber.php
+++ b/Civi/Token/AbstractTokenSubscriber.php
@@ -117,22 +117,6 @@ abstract class AbstractTokenSubscriber implements EventSubscriberInterface {
     }
   }
 
-  /**
-   * Get all custom field tokens of $entity
-   *
-   * @param string $entity
-   * @return array $customTokens
-   *   return custom field tokens in array('custom_N' => 'label') format
-   */
-  public function getCustomTokens($entity) {
-    $customTokens = array();
-    foreach (\CRM_Core_BAO_CustomField::getFields($entity) as $id => $info) {
-      $customTokens["custom_$id"] = $info['label'];
-    }
-
-    return $customTokens;
-  }
-
   /**
    * Alter the query which prepopulates mailing data
    * for scheduled reminders.