Merge pull request #8956 from TobiasLounsbury/CRM-19278

[civicrm-core.git] / CRM / Core / Form / Renderer.php

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 47ee1534c6aa53fa36d63f124c1cec3ebb9649d5..1535fd111e5409e8be191303ae408df4b05f89ee 100644 (file)
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -125,9 +125,9 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
         $date .= ($element->getAttribute('timeformat')) ? " $time" : '';
         $el['html'] = $date . '<input type="hidden" value="' . $element->getValue() . '" name="' . $element->getAttribute('name') . '">';
       }
-      if ($el['name'] == 'details') {
-        $el['html'] = str_replace('<br />', '', $el['html']);
-        $el['html'] = '<span class="crm-frozen-field">' . html_entity_decode($el['html']) . '</span>';
+      // Render html for wysiwyg textareas
+      if ($el['type'] == 'textarea' && isset($element->_attributes['class']) && strstr($element->_attributes['class'], 'wysiwyg')) {
+        $el['html'] = '<span class="crm-frozen-field">' . $el['value'] . '</span>';
       }
       else {
         $el['html'] = '<span class="crm-frozen-field">' . $el['html'] . '</span>';