Merge pull request #7531 from JKingsnorth/CRM-17261

[civicrm-core.git] / CRM / Member / PseudoConstant.php

diff --git a/CRM/Member/PseudoConstant.php b/CRM/Member/PseudoConstant.php
index c23305107907447c4beca12ba8c9adb101f2156c..d16e0c7cae8ca3abe4c809625b754c45d4f271b1 100644 (file)
--- a/CRM/Member/PseudoConstant.php
+++ b/CRM/Member/PseudoConstant.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -40,19 +40,19 @@
 class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant {
 
   /**
-   * Membership types
+   * Membership types.
    * @var array
    */
   private static $membershipType;
 
   /**
-   * Membership types
+   * Membership types.
    * @var array
    */
   private static $membershipStatus;
 
   /**
-   * Get all the membership types
+   * Get all the membership types.
    *
    *
    * @param int $id
@@ -61,7 +61,7 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant {
    * @return array
    *   array reference of all membership types if any
    */
-  public static function &membershipType($id = NULL, $force = FALSE) {
+  public static function membershipType($id = NULL, $force = TRUE) {
     if (!self::$membershipType || $force) {
       CRM_Core_PseudoConstant::populate(self::$membershipType,
         'CRM_Member_DAO_MembershipType',
@@ -81,7 +81,7 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant {
   }
 
   /**
-   * Get all the membership statuss
+   * Get all the membership statuss.
    *
    *
    * @param int $id
@@ -89,8 +89,10 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant {
    * @param string $column
    * @param bool $force
    *
+   * @param bool $allStatus
+   *
    * @return array
-   *   array reference of all membership statuss if any
+   *    array reference of all membership statuses if any
    */
   public static function &membershipStatus($id = NULL, $cond = NULL, $column = 'name', $force = FALSE, $allStatus = FALSE) {
     if (self::$membershipStatus === NULL) {