Merge pull request #4004 from civicrm/4.4

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

diff --git a/CRM/Admin/Form/Preferences.php b/CRM/Admin/Form/Preferences.php
index 6705d01c64e9b9012815b7a884d59fe8b601b7e3..d1f7b25219547703ee2bf5413bd399279abf06bf 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) {
@@ -188,6 +194,17 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
                 array('&nbsp;&nbsp;', '&nbsp;&nbsp;', '<br/>')
               );
               break;
+
+            case 'select':
+              $this->addElement('select',
+                $fieldName,
+                $fieldValue['title'],
+                $fieldValue['option_values']
+              );
+              break;
+
+            case 'entity_reference':
+              $this->addEntityRef($fieldName, $fieldValue['title'], CRM_Utils_Array::value('options', $fieldValue, array()));
           }
         }
 
@@ -264,6 +281,7 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
           case 'text':
           case 'select':
           case 'radio':
+          case 'entity_reference':
             $this->_config->$settingName = CRM_Utils_Array::value($settingName, $this->_params);
             break;