From: Joseph Martin <joeyisking@users.noreply.github.com>
Date: Mon, 21 Mar 2016 02:59:00 +0000 (+1100)
Subject: CRM-18270 Activity description not rendering html
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=864005dfae8013e71bc6e5f05902578ac5f34116;p=civicrm-core.git

CRM-18270 Activity description not rendering html
---

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 6ea326b8c1..2ed3dd39de 100644
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -125,8 +125,12 @@ 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') . '">';
       }
-
-      $el['html'] = '<span class="crm-frozen-field">' . $el['html'] . '</span>';
+      if ($el['name'] == 'details'){
+        $el['html'] = str_replace('<br />', '', $el['html']);
+        $el['html'] = '<span class="crm-frozen-field">' . html_entity_decode($el['html']) . '</span>';
+      }else{
+        $el['html'] = '<span class="crm-frozen-field">' . $el['html'] . '</span>';
+      }
     }
     // Active form elements
     else {