Merge pull request #4291 from mrpaulc/CRM-12920

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

diff --git a/CRM/Admin/Form/Preferences.php b/CRM/Admin/Form/Preferences.php
index 10e02561b8274f03a5bc84a6bb7da54e3ba26511..2836d064a3ac7f8cd0b153c1b08620d6db227c77 100644 (file)
--- a/CRM/Admin/Form/Preferences.php
+++ b/CRM/Admin/Form/Preferences.php
@@ -97,6 +97,9 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
     $session->pushUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1'));
   }
 
+  /**
+   * @return array
+   */
   function setDefaultValues() {
     $defaults = array();
 
@@ -109,6 +112,9 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
     return $defaults;
   }
 
+  /**
+   * @param $defaults
+   */
   function cbsDefaultValues(&$defaults) {
 
     foreach ($this->_varNames as $groupName => $groupValues) {
@@ -189,6 +195,18 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
               );
               break;
 
+            case 'select':
+              $this->addElement('select',
+                $fieldName,
+                $fieldValue['title'],
+                $fieldValue['option_values']
+              );
+              break;
+
+            case 'wysiwyg':
+              $this->addWysiwyg($fieldName, $fieldValue['title'], $fieldValue['attributes']);
+              break;
+
             case 'entity_reference':
               $this->addEntityRef($fieldName, $fieldValue['title'], CRM_Utils_Array::value('options', $fieldValue, array()));
           }