X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FAddress.setting.php;h=79def1b6cbf5ee1609e328150e2ae9e462cc333c;hb=61f53f0d67d4a86180bcf9d4b30790f3c79be6a2;hp=5a75c7138330a62bcac8cf8d67b96fe4d0d4823e;hpb=e32e663dddae93274cc28fd0539e48a98edbe8df;p=civicrm-core.git

diff --git a/settings/Address.setting.php b/settings/Address.setting.php
index 5a75c71383..79def1b6cb 100644
--- a/settings/Address.setting.php
+++ b/settings/Address.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2016
  * $Id$
  *
  */
@@ -79,4 +79,18 @@ return array(
     'help_text' => 'Web Service URL',
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
+  'hideCountryMailingLabels' => array(
+    'group_name' => 'Address Preferences',
+    'group' => 'address',
+    'name'  => 'hideCountryMailingLabels',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 0,
+    'add' => '4.7',
+    'title' => 'Hide Country in Mailing Labels when same as domain country',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'Do not display the country field in mailing labels when the country is the same as that of the domain',
+    'help_text' => NULL,
+  ),
 );