projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ab6519517da385d9a860ec4079fc8104afb4d6d9..149325d9b5dee987dd2d1a005504e0b80314034a 100644
(file)
--- a/
CRM/Admin/Form/Preferences.php
+++ b/
CRM/Admin/Form/Preferences.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
7
|
+ | Copyright CiviCRM LLC (c) 2004-201
8
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
7
+ * @copyright CiviCRM LLC (c) 2004-201
8
*/
/**
*/
/**
@@
-196,7
+196,8
@@
class CRM_Admin_Form_Preferences extends CRM_Core_Form {
$this->addElement('select',
$fieldName,
$fieldValue['title'],
$this->addElement('select',
$fieldName,
$fieldValue['title'],
- $fieldValue['option_values']
+ $fieldValue['option_values'],
+ CRM_Utils_Array::value('attributes', $fieldValue)
);
break;
);
break;