projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d99f95b
)
CRM-15354 - Fix undefined warning
author
Coleman Watts
<coleman@civicrm.org>
Fri, 26 Sep 2014 13:56:47 +0000
(09:56 -0400)
committer
Coleman Watts
<coleman@civicrm.org>
Fri, 26 Sep 2014 13:56:47 +0000
(09:56 -0400)
CRM/Core/Config/Variables.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Config/Variables.php
b/CRM/Core/Config/Variables.php
index 4b3ab2cfe138a2b3d8c4d6fe69f387271a1b8dab..7afd1b42b8f2be09cd1a304daaab5a0527765307 100644
(file)
--- 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];
}