fixes to comment blocks

[civicrm-core.git] / CRM / Admin / Form / Preferences.php

diff --git a/CRM/Admin/Form/Preferences.php b/CRM/Admin/Form/Preferences.php
index 2da915f66a186c7021d12aa815f93509430aa89b..3d392b2a2d048b0b9a5bb2fead6467cbcaceb333 100644 (file)
--- a/CRM/Admin/Form/Preferences.php
+++ b/CRM/Admin/Form/Preferences.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -202,7 +202,7 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
               break;
 
             case 'wysiwyg':
-              $this->addWysiwyg($fieldName, $fieldValue['title'], $fieldValue['attributes']);
+              $this->add('wysiwyg', $fieldName, $fieldValue['title'], $fieldValue['attributes']);
               break;
 
             case 'entity_reference':
@@ -305,6 +305,8 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
         );
       }
     }
+    // Update any settings stored in dynamic js
+    CRM_Core_Resources::singleton()->resetCacheCode();
 
     CRM_Core_Session::setStatus(ts('Your changes have been saved.'), ts('Saved'), 'success');
   }