X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMember%2FPseudoConstant.php;h=4faf4678d17608b5fb4d11642eacc38a124b0cdd;hb=b44e3f8468ceba3e1b321d31dd2e35a1aa1a5d9a;hp=5f729a673858667e25ba270ed5f408808534a399;hpb=b2ac9e9ca74be7f852e37e0dfbf0e77627471c4d;p=civicrm-core.git diff --git a/CRM/Member/PseudoConstant.php b/CRM/Member/PseudoConstant.php index 5f729a6738..4faf4678d1 100644 --- a/CRM/Member/PseudoConstant.php +++ b/CRM/Member/PseudoConstant.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$ * */ @@ -40,28 +40,26 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { /** - * Membership types + * Membership types. * @var array - * @static */ private static $membershipType; /** - * Membership types + * Membership types. * @var array - * @static */ private static $membershipStatus; /** - * Get all the membership types + * Get all the membership types. * * * @param int $id * @param bool $force * - * @return array - array reference of all membership types if any - * @static + * @return array + * array reference of all membership types if any */ public static function &membershipType($id = NULL, $force = FALSE) { if (!self::$membershipType || $force) { @@ -83,7 +81,7 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { } /** - * Get all the membership statuss + * Get all the membership statuss. * * * @param int $id @@ -91,8 +89,8 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { * @param string $column * @param bool $force * - * @return array - array reference of all membership statuss if any - * @static + * @return array + * array reference of all membership statuss if any */ public static function &membershipStatus($id = NULL, $cond = NULL, $column = 'name', $force = FALSE, $allStatus = FALSE) { if (self::$membershipStatus === NULL) { @@ -125,13 +123,13 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * next time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ public static function flush($name = 'cache') { - if (isset(self::$$name)) { + if (isset(self::$$name)) { self::$$name = NULL; } } + }