X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FCache.php;h=94b2cfb4ee28698a515b59b17abfa127eded7d4b;hb=24a8c2f7bc0d6ce8472a8a8aaca8551f634b36c9;hp=68c8862fcbf6d94f5e921f4382be506a585e6544;hpb=7d86179d7d8e91160bbb5e6643fa265198a99a2d;p=civicrm-core.git diff --git a/CRM/Utils/Cache.php b/CRM/Utils/Cache.php index 68c8862fcb..94b2cfb4ee 100644 --- a/CRM/Utils/Cache.php +++ b/CRM/Utils/Cache.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2014 | + | Copyright CiviCRM LLC (c) 2004-2015 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -23,12 +23,12 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2014 + * @copyright CiviCRM LLC (c) 2004-2015 * $Id$ * */ @@ -43,12 +43,11 @@ class CRM_Utils_Cache { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; /** - * Constructor + * Constructor. * * @param array $config * An array of configuration params. @@ -60,10 +59,9 @@ class CRM_Utils_Cache { } /** - * Singleton function used to manage this object + * Singleton function used to manage this object. * * @return object - * @static */ public static function &singleton() { if (self::$_singleton === NULL) { @@ -93,13 +91,12 @@ class CRM_Utils_Cache { } /** - * Get cache relevant settings + * Get cache relevant settings. * * @param $cachePlugin * * @return array * associative array of settings for the cache - * @static */ public static function getCacheSettings($cachePlugin) { switch ($cachePlugin) { @@ -165,4 +162,5 @@ class CRM_Utils_Cache { } return $defaults; } + }