CRM-14811 - Move enable_innodb_fts from "Admin => Misc" to "Admin => Search Prefs"

diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php
index 11b6f222c93c615daa8f700525435e70d4c70dad..1c357d9cafacd52421a6149a192c7691161a6e60 100644 (file)
--- a/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -48,7 +48,6 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting {
     'maxFileSize' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'doNotAttachPDFReceipt' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'secondDegRelPermissions' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
-    'enable_innodb_fts' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
   );
 
   /**

diff --git a/CRM/Admin/Form/Setting/Search.php b/CRM/Admin/Form/Setting/Search.php
index a3c49840e741f7f275f31b4b687c34590cfc56cb..a6673f69883a44857a8462ca6423fae35c2b5ca2 100644 (file)
--- a/CRM/Admin/Form/Setting/Search.php
+++ b/CRM/Admin/Form/Setting/Search.php
@@ -41,6 +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,
   );
 
   /**

diff --git a/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl b/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
index a06f3be5bed5c35321f7616fa4ae70b9a48c53e3..20fa6e82fea5c44d8822bda149e3f8683eb7423c 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
+++ b/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
@@ -104,12 +104,6 @@
             </td>
         </tr>
 
-        <tr class="crm-miscellaneous-form-block-enable_innodb_fts">
-            <td class="label">{$form.enable_innodb_fts.label}</td>
-            <td>{$form.enable_innodb_fts.html}<br />
-                <p class="description">{$enable_innodb_fts_description}</p>
-            </td>
-        </tr>
     </table>
 <h3>{ts}reCAPTCHA Keys{/ts}</h3>
     <div class="description">

diff --git a/templates/CRM/Admin/Form/Setting/Search.tpl b/templates/CRM/Admin/Form/Setting/Search.tpl
index 30e594b6c65c75cbe1546e6919354ab29fb6b3e9..a1618027f7a568cc5e4190d864deb09686495ed7 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Search.tpl
+++ b/templates/CRM/Admin/Form/Setting/Search.tpl
@@ -77,6 +77,14 @@
             <td>{$form.search_autocomplete_count.html}<br />
             <span class="description">{ts}The maximum number of contacts to show at a time when typing in an autocomplete field.{/ts}</span></td>
         </tr>
+        <tr class="crm-miscellaneous-form-block-enable_innodb_fts">
+            <td class="label">{$form.enable_innodb_fts.label}</td>
+            <td>{$form.enable_innodb_fts.html}<br />
+                <p class="description">{$enable_innodb_fts_description}</p>
+            </td>
+        </tr>
+
+
        </table>
             <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>