From 9f43809ad56a9ccf32fa442043e44098aff59ef7 Mon Sep 17 00:00:00 2001
From: kurund <kurund@civicrm.org>
Date: Thu, 13 Mar 2014 20:28:28 +0530
Subject: [PATCH] test fixes, I feel it's caching issue

---
 CRM/Core/SelectValues.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index 8c45192b3f..89b60bfc04 100644
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -373,18 +373,26 @@ class CRM_Core_SelectValues {
    * @static
    */
   static function ufVisibility($isGroup = FALSE) {
-    static $_visibility = NULL;
+    $key = 'uf';
+    if ($isGroup) {
+      $key = 'group';
+    }
+
     if (!$_visibility) {
-      $_visibility = array(
+      static $_visibility = array();
+    }
+
+    if (!isset($_visibility[$key])) {
+      $_visibility[$key] = array(
         'User and User Admin Only' => ts('User and User Admin Only'),
         'Public Pages' => ts('Public Pages'),
         'Public Pages and Listings' => ts('Public Pages and Listings'),
       );
       if ($isGroup) {
-        unset($_visibility['Public Pages and Listings']);
+        unset($_visibility[$key]['Public Pages and Listings']);
       }
     }
-    return $_visibility;
+    return $_visibility[$key];
   }
 
   /**
-- 
2.25.1