Merge pull request #13039 from colemanw/quicksearchSetting

[civicrm-core.git] / settings / Core.setting.php

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 47b6ad439c9bf21aee950b3eaeb594330ee21f42..a7a46101b7d5000986e37e0d57a9ef50faff8c97 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -214,10 +214,13 @@ return array(
     'group' => 'core',
     'name' => 'editor_id',
     'type' => 'String',
-    'html_type' => 'Select',
+    'html_type' => 'select',
     'default' => 'CKEditor',
     'add' => '4.1',
     'title' => ts('Wysiwig Editor'),
+    'pseudoconstant' => array(
+      'optionGroupName' => 'wysiwyg_editor',
+    ),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -236,6 +239,7 @@ return array(
     'is_contact' => 0,
     'description' => NULL,
     'help_text' => NULL,
+    'options' => ['1' => ts('While Typing'), '0' => ts('When Saving'), '2' => ts('Never')],
   ),
   'ajaxPopupsEnabled' => array(
     'group_name' => 'CiviCRM Preferences',
@@ -488,7 +492,7 @@ return array(
       'size' => 64,
       'maxlength' => 256,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Path to wkhtmltopdf executable'),
@@ -507,7 +511,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Options'),
@@ -526,7 +530,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Site Key'),
@@ -560,7 +564,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Secret Key'),
@@ -579,7 +583,7 @@ return array(
       'size' => 2,
       'maxlength' => 8,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => 7,
     'add' => '4.3',
     'title' => ts('Checksum Lifespan'),
@@ -598,7 +602,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Blog Feed URL'),
@@ -617,7 +621,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Community Messages URL'),
@@ -636,7 +640,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Getting Started URL'),
@@ -996,9 +1000,9 @@ return array(
     'is_domain' => 1,
     'is_contact' => 0,
     'default' => array(),
-    'title' => 'Do not notify assignees for',
-    'help_text' => 'These activity types will be excluded from automated email notifications to assignees.',
-    'html_type' => 'Select',
+    'title' => ts('Do not notify assignees for'),
+    'description' => ts('These activity types will be excluded from automated email notifications to assignees.'),
+    'html_type' => 'select',
     'html_attributes' => array(
       'multiple' => 1,
       'class' => 'huge crm-select2',