Fix OptionGroup::values cache CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 64131a314b3c9927f34acb7e3002d60bc778193b..4008a3ee830091e4ba532654c7c480bbaede5808 100644 (file)
--- 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;