From f3c2c514fea43d6e8a5cd81edf32b2418388ccd5 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 26 Sep 2014 09:56:47 -0400
Subject: [PATCH] CRM-15354 - Fix undefined warning

---
 CRM/Core/Config/Variables.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/Config/Variables.php b/CRM/Core/Config/Variables.php
index 4b3ab2cfe1..7afd1b42b8 100644
--- a/CRM/Core/Config/Variables.php
+++ b/CRM/Core/Config/Variables.php
@@ -541,7 +541,7 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
    */
   public function defaultContactCountryName() {
     static $cachedContactCountryName = NULL;
-    if (!$cachedContactCountryName) {
+    if (!$cachedContactCountryName && $this->defaultContactCountry) {
       $countryCodes = CRM_Core_PseudoConstant::country();
       $cachedContactCountryName = $countryCodes[$this->defaultContactCountry];
     }
-- 
2.25.1