From: Donald A. Lobo <lobo@civicrm.org>
Date: Wed, 22 May 2013 15:53:55 +0000 (-0700)
Subject: CRM-12678
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7cdc9e9fc9aced3925194e18b360b14b780c250c;p=civicrm-core.git

CRM-12678

----------------------------------------
* CRM-12678: PseudoConstant.php on line 122 returns value not reference
  http://issues.civicrm.org/jira/browse/CRM-12678
---

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 96c5328f15..790124c59c 100644
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -1008,7 +1008,7 @@ WHERE  id = %1";
         return self::$country[$id];
       }
       else {
-        return NULL;
+        return CRM_Core_DAO::$_nullObject;
       }
     }
     return self::$country;
@@ -1038,7 +1038,7 @@ WHERE  id = %1";
         return self::$countryIsoCode[$id];
       }
       else {
-        return NULL;
+        return CRM_Core_DAO::$_nullObject;
       }
     }
     return self::$countryIsoCode;
@@ -1605,7 +1605,7 @@ WHERE  id = %1";
         return self::$county[$id];
       }
       else {
-        return NULL;
+        return CRM_Core_DAO::$_nullObject;
       }
     }
     return self::$county;
@@ -1710,7 +1710,7 @@ WHERE  id = %1";
         return self::$worldRegions[$id];
       }
       else {
-        return NULL;
+        return CRM_Core_DAO::$_nullObject;
       }
     }
 
@@ -1946,7 +1946,7 @@ ORDER BY name";
    */
   static function countryIDForStateID($stateID) {
     if (empty($stateID)) {
-      return NULL;
+      return CRM_Core_DAO::$_nullObject;
     }
 
     $query = "