fix up optiongroup & type in settings for a couple of settings

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 536bec2c5fa188af150b83e52d61f5a97c710f8b..af2b70d8696976ef95f90627339c2fd8b5c62921 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -126,7 +126,7 @@ return array (
     'group' => 'core',
     'name' => 'address_format',
     'type' => 'String',
-    'html_type' => 'Text',
+    'html_type' => 'TextArea',
     'default' => "{contact.address_name}\n{contact.street_address}\n{contact.supplemental_address_1}\n{contact.supplemental_address_2}\n{contact.city}{, }{contact.state_province}{ }{contact.postal_code}\n{contact.country}",
     'add' => '4.1',
     'title' => 'Address Format',
@@ -239,6 +239,9 @@ return array (
     'name' => 'contact_autocomplete_options',
     'type' => 'String',
     'html_type' => 'checkboxes',
+    'pseudoconstant' => array(
+      'optionGroupName' => 'contact_autocomplete_options',
+    ),
     'default' => '\ 11\ 12\ 13\ 14\ 15\ 16\ 17\ 1',
     'add' => '4.1',
     'title' => 'Contact Reference Autocomplete Options',