From be80e977c1dae12a0ea4d23af1e8c0cd460f0cdc Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 31 May 2013 09:58:32 -0700
Subject: [PATCH] Fix OptionGroup::values cache CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464
---
 CRM/Core/OptionGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 64131a314b..4008a3ee83 100644
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -103,6 +103,7 @@ class CRM_Core_OptionGroup {
     $localize = FALSE, $condition = NULL,
     $labelColumnName = 'label', $onlyActive = TRUE, $fresh = FALSE, $keyColumnName = 'value'
   ) {
+    $cache = CRM_Utils_Cache::singleton();
     $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName);
 
     if (!$fresh) {
@@ -111,7 +112,6 @@ class CRM_Core_OptionGroup {
         return self::$_cache[$cacheKey];
       }
       // Fetch from main cache
-      $cache = CRM_Utils_Cache::singleton();
       $var = $cache->get($cacheKey);
       if ($var) {
         return $var;
-- 
2.25.1