CRM-19723 - Add crmIconPicker widget

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

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 6ea326b8c1eb4168ff179d9a18e2538a0d66f54c..6f235382dbf9cf1ea3091d215189f88c24893603 100644 (file)
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
  * $Id$
  *
  */
@@ -125,8 +125,13 @@ 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>';
+      // 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>';
+      }
     }
     // Active form elements
     else {
@@ -134,7 +139,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
         $this->addOptionsEditLink($el, $element);
       }
 
-      if ($element->getType() == 'group' && $element->getAttribute('allowClear')) {
+      if ($element->getAttribute('allowClear')) {
         $this->appendUnselectButton($el, $element);
       }
     }