Merge pull request #6982 from eileenmcnaughton/CRM-17412

[civicrm-core.git] / CRM / Friend / Form.php

diff --git a/CRM/Friend/Form.php b/CRM/Friend/Form.php
index f8da2d709eaa65183b556453e7a9b3883afbd8a3..5c0278aecdbcd4884a7999222c721b79ee81f8b9 100644 (file)
--- a/CRM/Friend/Form.php
+++ b/CRM/Friend/Form.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
@@ -179,6 +179,7 @@ class CRM_Friend_Form extends CRM_Core_Form {
    * @return void
    */
   public function buildQuickForm() {
+    $this->applyFilter('__ALL__', 'trim');
     // Details of User
     $name = &$this->add('text',
       'from_name',
@@ -195,7 +196,7 @@ class CRM_Friend_Form extends CRM_Core_Form {
     );
     $email->freeze();
 
-    $this->addWysiwyg('suggested_message', ts('Your Message'), CRM_Core_DAO::getAttribute('CRM_Friend_DAO_Friend', 'suggested_message'));
+    $this->add('wysiwyg', 'suggested_message', ts('Your Message'), CRM_Core_DAO::getAttribute('CRM_Friend_DAO_Friend', 'suggested_message'));
     $friend = array();
     $mailLimit = self::NUM_OPTION;
     if ($this->_entityTable == 'civicrm_pcp') {