From a5e2b32e3d2f2afc0a8f3af6fa56d3a3a0446c42 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 19 May 2014 22:09:33 +1200
Subject: [PATCH] minor code tidy ups

---
 CRM/Member/BAO/Membership.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 909d5354f0..53b0c20ea7 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -73,12 +73,11 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
    * @access public
    * @static
    */
-  static function &add(&$params, &$ids) {
-
-    if (!empty($ids['membership'])) {
+  static function add(&$params, &$ids) {
+    $oldStatus = $oldType = NULL;
+     if (!empty($ids['membership'])) {
       CRM_Utils_Hook::pre('edit', 'Membership', $ids['membership'], $params);
-      $oldStatus         = NULL;
-      $oldType           = NULL;
+
       $membershipObj     = new CRM_Member_DAO_Membership();
       $membershipObj->id = $ids['membership'];
       $membershipObj->find();
@@ -237,7 +236,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
    * @access public
    * @static
    */
-  static function &create(&$params, &$ids, $skipRedirect = FALSE, $activityType = 'Membership Signup') {
+  static function create(&$params, &$ids, $skipRedirect = FALSE, $activityType = 'Membership Signup') {
     // always calculate status if is_override/skipStatusCal is not true.
     // giving respect to is_override during import.  CRM-4012
 
@@ -2002,7 +2001,7 @@ SELECT c.contribution_page_id as pageID
    *
    * @param null $mode
    *
-   * @return return the list of membership fields
+   * @return array the list of membership fields
    * @static
    * @access public
    */
@@ -2425,7 +2424,7 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
    * @param int $endDate date on which to end counting
    * @param bool|int $isTest if true, membership is for a test site
    *
-   * @return returns the number of members of type $membershipTypeId
+   * @return integer returns the number of members of type $membershipTypeId
    *         whose join_date is before $startDate and
    *         whose start_date is between $startDate and $endDate
    */
-- 
2.25.1