From c8fd28dc41898382c10d522c5ea692275b15369d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 6 Jul 2017 17:15:04 -0700
Subject: [PATCH] CRM-20816 - Rename civicaseAllowMultipleCaseClients to
 civicaseAllowMultipleClients

The second instance of the word "case" seems redundant.  Nip it in the bud.
---
 CRM/Admin/Form/Setting/Case.php                | 2 +-
 CRM/Case/XMLProcessor/Process.php              | 2 +-
 CRM/Case/xml/configuration.sample/Settings.xml | 2 +-
 settings/Case.setting.php                      | 4 ++--
 templates/CRM/Admin/Form/Setting/Case.tpl      | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Admin/Form/Setting/Case.php b/CRM/Admin/Form/Setting/Case.php
index 015b8422dd..12ae261cc4 100644
--- a/CRM/Admin/Form/Setting/Case.php
+++ b/CRM/Admin/Form/Setting/Case.php
@@ -38,7 +38,7 @@ class CRM_Admin_Form_Setting_Case extends CRM_Admin_Form_Setting {
 
   protected $_settings = array(
     'civicaseRedactActivityEmail' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
-    'civicaseAllowMultipleCaseClients' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
+    'civicaseAllowMultipleClients' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'civicaseNaturalActivityTypeSort' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
   );
 
diff --git a/CRM/Case/XMLProcessor/Process.php b/CRM/Case/XMLProcessor/Process.php
index 541b7a486b..6ba3a4a3be 100644
--- a/CRM/Case/XMLProcessor/Process.php
+++ b/CRM/Case/XMLProcessor/Process.php
@@ -644,7 +644,7 @@ AND        a.is_deleted = 0
    *   1 if allowed, 0 if not
    */
   public function getAllowMultipleCaseClients() {
-    return $this->getBoolSetting('civicaseAllowMultipleCaseClients', 'AllowMultipleCaseClients');
+    return $this->getBoolSetting('civicaseAllowMultipleClients', 'AllowMultipleCaseClients');
   }
 
   /**
diff --git a/CRM/Case/xml/configuration.sample/Settings.xml b/CRM/Case/xml/configuration.sample/Settings.xml
index 8a89315a5b..424eb7afdf 100644
--- a/CRM/Case/xml/configuration.sample/Settings.xml
+++ b/CRM/Case/xml/configuration.sample/Settings.xml
@@ -17,7 +17,7 @@
   <RedactActivityEmail>0</RedactActivityEmail>
 
   <!-- Set this to 1 if you want to allow multiple clients to be associated with a single case -->
-  <!-- SEE ALSO: Setting "civicaseAllowMultipleCaseClients" -->
+  <!-- SEE ALSO: Setting "civicaseAllowMultipleClients" -->
   <AllowMultipleCaseClients>0</AllowMultipleCaseClients>
 
   <!-- Set this to 1 if you want to have activity types on Manage Case
diff --git a/settings/Case.setting.php b/settings/Case.setting.php
index 77f3b0f4b2..412375411f 100644
--- a/settings/Case.setting.php
+++ b/settings/Case.setting.php
@@ -58,10 +58,10 @@ return array(
     'description' => 'Should activity emails be redacted? (Set "Default" to load setting from the legacy "Settings.xml" file.)',
     'help_text' => '',
   ),
-  'civicaseAllowMultipleCaseClients' => array(
+  'civicaseAllowMultipleClients' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
-    'name' => 'civicaseAllowMultipleCaseClients',
+    'name' => 'civicaseAllowMultipleClients',
     'type' => 'String',
     'quick_form_type' => 'Select',
     'html_type' => 'Select',
diff --git a/templates/CRM/Admin/Form/Setting/Case.tpl b/templates/CRM/Admin/Form/Setting/Case.tpl
index 7da337b15d..9b8f7f2d26 100644
--- a/templates/CRM/Admin/Form/Setting/Case.tpl
+++ b/templates/CRM/Admin/Form/Setting/Case.tpl
@@ -35,9 +35,9 @@
          <span class="description">{ts}Should activity emails be redacted?{/ts} {ts}(Set "Default" to load setting from the legacy "Settings.xml" file.){/ts}</span>
        </td>
      </tr>
-     <tr class="crm-case-form-block-civicaseAllowMultipleCaseClients">
-       <td class="label">{$form.civicaseAllowMultipleCaseClients.label}</td>
-       <td>{$form.civicaseAllowMultipleCaseClients.html}<br />
+     <tr class="crm-case-form-block-civicaseAllowMultipleClients">
+       <td class="label">{$form.civicaseAllowMultipleClients.label}</td>
+       <td>{$form.civicaseAllowMultipleClients.html}<br />
          <span class="description">{ts}How many clients may be associated with a given case?{/ts} {ts}(Set "Default" to load setting from the legacy "Settings.xml" file.){/ts}</span>
        </td>
      </tr>
-- 
2.25.1