From 9647286dede260c1df36c6c6569b7159d23a1b9b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 20 Jun 2018 22:39:31 -0700
Subject: [PATCH] CRM_Core_OptionGroup - Use PSR-16 compliant cache key

---
 CRM/Core/OptionGroup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index bc1f7ad2ac..c7e07e67d6 100644
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -200,8 +200,8 @@ WHERE  v.option_group_id = g.id
   /**
    * @return string
    */
-  protected static function createCacheKey() {
-    $cacheKey = "CRM_OG_" . serialize(func_get_args());
+  protected static function createCacheKey($id) {
+    $cacheKey = "CRM_OG_" . preg_replace('/[^a-zA-Z0-9]/', '', $id) . '_' . md5(serialize(func_get_args()));
     return $cacheKey;
   }
 
-- 
2.25.1