Revert "Make `formal_title` field optional"

This reverts commit 5b5217d75b850748f19707387b65806831acf670.

In preparation for more generic name field configurability.

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index f09f7db50dc7c0d6e87dfef64956cbfa1e1faf52..6ec0ead1118291e338d5d9de66a9def7b8682300 100644 (file)
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -104,11 +104,6 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences {
           'html_type' => NULL,
           'weight' => 11,
         ),
-        'formal_title' => array(
-          'html_type' => 'checkbox',
-          'title' => ts('Use Formal Title Field'),
-          'weight' => 12,
-        ),
       ),
     );
 

diff --git a/CRM/Contact/Form/Edit/Individual.php b/CRM/Contact/Form/Edit/Individual.php
index 45a4e78f1dfb438840bf3c3b5e6e53b26072a196..d87f7dddc49a00fa6aa593b0749eebedb6db079c 100644 (file)
--- a/CRM/Contact/Form/Edit/Individual.php
+++ b/CRM/Contact/Form/Edit/Individual.php
@@ -63,9 +63,7 @@ class CRM_Contact_Form_Edit_Individual {
 
       $attributes = CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact');
 
-      if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'formal_title')) {
-        $form->addElement('text', 'formal_title', ts('Title'), $attributes['formal_title']);
-      }
+      $form->addElement('text', 'formal_title', ts('Title'), $attributes['formal_title']);
 
       // first_name
       $form->addElement('text', 'first_name', ts('First Name'), $attributes['first_name']);

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 8826e5481a4e5dbfa122aaf0a0cd92ee7b1832e6..6aa61302ce18d61f757b9bc5b977be31770f8528 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -250,20 +250,6 @@ return array (
     'description' => null,
      'help_text' => null,
   ),
-  'formal_title' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'formal_title',
-    'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
-    'default' => 0,
-    'add' => '4.4',
-    'title' => 'Use Formal Title Field',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => 'Enables display of the Formal Title field in the name edit block for individuals.',
-    'help_text' => null,
-  ),
   'contact_reference_options' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',

diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index d2336f5a41c5197a1b1bcb56e0ddcfce8f5afcde..3f0e6e7e5d705b00eae712abf469ad470d8d2191 100644 (file)
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -184,16 +184,6 @@
           fields).{/ts} {help id="id-editor_id"}
       </td>
     </tr>
-    <tr class="crm-preferences-display-form-block-formal_title">
-      <td class="label">{$form.formal_title.label}</td>
-      <td>{$form.formal_title.html}</td>
-    </tr>
-    <tr class="crm-preferences-display-form-block-description">
-      <td>&nbsp;</td>
-      <td class="description">
-        {ts}Enables display of the Formal Title field in the name edit block for individuals.{/ts}
-      </td>
-    </tr>
     <tr class="crm-preferences-display-form-block-display_name_format">
       <td class="label">{$form.display_name_format.label}</td>
       <td>{$form.display_name_format.html}</td>