CRM-16876 Ensure that foreign countires are also capitalised when hiding country...

diff --git a/CRM/Utils/Address.php b/CRM/Utils/Address.php
index 581da23a0840af2094d2f029dd7dc9453cb192f5..f08e408204b15bacf91e41c23b0a4675f3fb505c 100644 (file)
--- 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']);