Merge pull request #10496 from jitendrapurohit/CRM-20719

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

diff --git a/CRM/Admin/Form/Preferences.php b/CRM/Admin/Form/Preferences.php
index 1bd8a4dd011cb15148f73a2ec5e9b0ddd1ac4243..149325d9b5dee987dd2d1a005504e0b80314034a 100644 (file)
--- a/CRM/Admin/Form/Preferences.php
+++ b/CRM/Admin/Form/Preferences.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  */
 
 /**
@@ -196,14 +196,11 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
               $this->addElement('select',
                 $fieldName,
                 $fieldValue['title'],
-                $fieldValue['option_values']
+                $fieldValue['option_values'],
+                CRM_Utils_Array::value('attributes', $fieldValue)
               );
               break;
 
-            case 'advmultiselect':
-              $this->addElement('advmultiselect', $fieldName, $fieldValue['title'], $fieldValue['options'], $fieldValue['attributes']);
-              break;
-
             case 'wysiwyg':
               $this->add('wysiwyg', $fieldName, $fieldValue['title'], $fieldValue['attributes']);
               break;
@@ -276,7 +273,6 @@ class CRM_Admin_Form_Preferences extends CRM_Core_Form {
 
           case 'text':
           case 'select':
-          case 'advmultiselect':
           case 'radio':
           case 'YesNo':
           case 'entity_reference':