CRM-14811 - enable_innodb_fts - Move from group SYSTEM_PREFERENCES_NAME to SEARCH_PRE...

diff --git a/CRM/Admin/Form/Setting/Search.php b/CRM/Admin/Form/Setting/Search.php
index a6673f69883a44857a8462ca6423fae35c2b5ca2..792845db2ecd2b564c4c26e542d68b5297d64751 100644 (file)
--- a/CRM/Admin/Form/Setting/Search.php
+++ b/CRM/Admin/Form/Setting/Search.php
@@ -41,7 +41,7 @@ class CRM_Admin_Form_Setting_Search extends CRM_Admin_Form_Setting {
 
   protected $_settings = array(
     'search_autocomplete_count' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
-    'enable_innodb_fts' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
+    'enable_innodb_fts' => CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME,
   );
 
   /**

diff --git a/CRM/Core/InnoDBIndexer.php b/CRM/Core/InnoDBIndexer.php
index cce2802e5add02e4183b6f8e3fec7ddf7b0d4ec0..fca34148b098f57cfdac8604de3bd9bfbc45e232 100644 (file)
--- a/CRM/Core/InnoDBIndexer.php
+++ b/CRM/Core/InnoDBIndexer.php
@@ -75,7 +75,7 @@ class CRM_Core_InnoDBIndexer {
           array('name'),
         ),
       );
-      $active = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enable_innodb_fts', NULL, FALSE);
+      $active = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME, 'enable_innodb_fts', NULL, FALSE);
       self::$singleton = new self($active, $indices);
     }
     return self::$singleton;

diff --git a/CRM/Upgrade/Incremental/Legacy.php b/CRM/Upgrade/Incremental/Legacy.php
index e489ce0d05c6e215af97813a14fc1c81b0ae21e7..b296ffd7295fcd9a59170f427969071de1c1abfc 100644 (file)
--- a/CRM/Upgrade/Incremental/Legacy.php
+++ b/CRM/Upgrade/Incremental/Legacy.php
@@ -111,7 +111,7 @@ SELECT  id
       }
     }
 
-    if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enable_innodb_fts', NULL, FALSE)) {
+    if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SEARCH_PREFERENCES_NAME, 'enable_innodb_fts', NULL, FALSE)) {
       // The FTS indexing feature dynamically manipulates the schema which could
       // cause conflicts with other layers that manipulate the schema. The
       // simplest thing is to turn it off and back on.

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index d637664f830603e5d97dd036fa77fa4ce413dd0e..556dad263c3aea9ae9d20ec6bc03da92320ad56f 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -714,23 +714,4 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'description' => 'When enabled, "empowered by CiviCRM" is displayed at the bottom of public forms.',
     'help_text' => null,
   ),
-  'enable_innodb_fts' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'enable_innodb_fts',
-    'prefetch' => 0,
-    'config_only'=> 0,
-    'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
-    'default' => 0,
-    'add' => '4.4',
-    'title' => 'InnoDB Full Text Search',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "Enable InnoDB full-text search optimizations. (Requires MySQL 5.6+)",
-    'help_text' => null,
-    'on_change' => array(
-      array('CRM_Core_InnoDBIndexer', 'onToggleFts'),
-    ),
-  ),
 );

diff --git a/settings/Search.setting.php b/settings/Search.setting.php
index 675ed195987a42185b3a85d043a920043fb6985d..1fffb09c33ca81bc4bfd2bb9c68c3c2007658c8b 100644 (file)
--- a/settings/Search.setting.php
+++ b/settings/Search.setting.php
@@ -56,6 +56,25 @@ return array (
     'description' => 'The maximum number of contacts to show at a time when typing in an autocomplete field.',
     'help_text' => null,
   ),
+  'enable_innodb_fts' => array(
+    'group_name' => 'Search Preferences',
+    'group' => 'Search Preferences',
+    'name' => 'enable_innodb_fts',
+    'prefetch' => 0,
+    'config_only'=> 0,
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 0,
+    'add' => '4.4',
+    'title' => 'InnoDB Full Text Search',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => "Enable InnoDB full-text search optimizations. (Requires MySQL 5.6+)",
+    'help_text' => null,
+    'on_change' => array(
+      array('CRM_Core_InnoDBIndexer', 'onToggleFts'),
+    ),
+  ),
   'fts_query_mode' => array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',