From ee7e643e7ee095a3a67efc0ba2c86ad1980701b2 Mon Sep 17 00:00:00 2001 From: Oleh Vehera Date: Mon, 13 Apr 2020 11:15:16 +0300 Subject: [PATCH] Fix hardcoded filtered_html format set in the ResourceFieldEntityText --- .../resource/Field/ResourceFieldEntityText.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Plugin/resource/Field/ResourceFieldEntityText.php b/src/Plugin/resource/Field/ResourceFieldEntityText.php index a34e25e7..f5acc388 100644 --- a/src/Plugin/resource/Field/ResourceFieldEntityText.php +++ b/src/Plugin/resource/Field/ResourceFieldEntityText.php @@ -30,10 +30,15 @@ public function preprocess($value) { if (!$instance['settings']['text_processing']) { return $value; } - + if (isset($value['value'], $value['format'])) { + return array( + 'value' => $value['value'], + 'format' => $value['format'], + ); + } + // Fallback to the initial behavior to support BC. return array( 'value' => $value, - // TODO: This is hardcoded! Fix it. 'format' => 'filtered_html', ); } @@ -43,7 +48,14 @@ public function preprocess($value) { if (!$instance['settings']['text_processing']) { $return[$delta] = $single_value; } + elseif (isset($single_value['value'], $single_value['format'])) { + $return[$delta] = array( + 'value' => $single_value['value'], + 'format' => $single_value['format'], + ); + } else { + // Fallback to the initial behavior to support BC. $return[$delta] = array( 'value' => $single_value, 'format' => 'filtered_html',