From: eileen <eileen@fuzion.co.nz>
Date: Wed, 6 Mar 2013 08:38:09 +0000 (+1300)
Subject: fix up optiongroup & type in settings for a couple of settings
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=77d87f6e52ad46069c0aa9f18ce9ef173ffb9aba;p=civicrm-core.git

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 536bec2c5f..af2b70d869 100644
--- 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' => '
1
2
3
4
5
6
7
',
     'add' => '4.1',
     'title' => 'Contact Reference Autocomplete Options',