From 2d94c5c1fd54275a51e8e89e291eae997e975966 Mon Sep 17 00:00:00 2001 From: Bernd Oliver Suenderhauf <bos@suenderhauf.de> Date: Fri, 31 May 2019 15:37:01 +0200 Subject: [PATCH] Revert: Issue #3048054 by Pancho: Add special treatment for taxonomy token types --- src/FillPdfAdminFormHelperInterface.php | 3 ++- src/Service/FillPdfAdminFormHelper.php | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/FillPdfAdminFormHelperInterface.php b/src/FillPdfAdminFormHelperInterface.php index 7a94166..3f001b0 100644 --- a/src/FillPdfAdminFormHelperInterface.php +++ b/src/FillPdfAdminFormHelperInterface.php @@ -13,7 +13,8 @@ interface FillPdfAdminFormHelperInterface { * Returns render array for a link to a token tree shown as a dialog. * * @param string[]|string $token_types - * (optional) Array of token types. Defaults to 'all'. + * (optional) Array of token types. Defaults to 'all'. Note that it's the + * caller's duty to translate entity types into token types. * * @return array * Render array. diff --git a/src/Service/FillPdfAdminFormHelper.php b/src/Service/FillPdfAdminFormHelper.php index d11f8e2..30d71bf 100644 --- a/src/Service/FillPdfAdminFormHelper.php +++ b/src/Service/FillPdfAdminFormHelper.php @@ -67,12 +67,6 @@ class FillPdfAdminFormHelper implements FillPdfAdminFormHelperInterface { * {@inheritdoc} */ public function getAdminTokenForm($token_types = 'all') { - // Special treatment for Core's taxonomy_term and taxonomy_vocabulary. - if (is_array($token_types)) { - foreach ($token_types as $key => $type) { - $token_types[$key] = strtr($type, ['taxonomy_' => '']); - } - } return [ '#theme' => 'token_tree_link', '#token_types' => $token_types, -- GitLab