From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 26 Sep 2016 01:22:15 +0000 (+1000)
Subject: CRM-16876 Ensure that foreign countires are also capitalised when hiding country... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e22e10f59c4996f5ef3bc9a912033dc7d9f094ae;p=civicrm-core.git

CRM-16876 Ensure that foreign countires are also capitalised when hiding country for local mailing
---

diff --git a/CRM/Utils/Address.php b/CRM/Utils/Address.php
index 581da23a08..f08e408204 100644
--- a/CRM/Utils/Address.php
+++ b/CRM/Utils/Address.php
@@ -104,6 +104,9 @@ class CRM_Utils_Address {
         if ($fields['country'] == CRM_Core_PseudoConstant::country($domainCountryId)) {
           $fields['country'] = NULL;
         }
+        else {
+          $fields['country'] = strtoupper($fields['country']);
+        }
       }
       else {
         $fields['country'] = strtoupper($fields['country']);