X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMember%2FBAO%2FMembershipPayment.php;h=aeef774c4a53588f6911258483fbad4089121cde;hb=317fceb45c357553effb3fca07c13ae53ada9e9d;hp=f83dbc1a59392f6d0d82493730f40b5388703e72;hpb=e01a5ffed559ccb3a64fba29f0ca8964e00d3178;p=civicrm-core.git

diff --git a/CRM/Member/BAO/MembershipPayment.php b/CRM/Member/BAO/MembershipPayment.php
index f83dbc1a59..aeef774c4a 100644
--- a/CRM/Member/BAO/MembershipPayment.php
+++ b/CRM/Member/BAO/MembershipPayment.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -36,22 +36,22 @@ class CRM_Member_BAO_MembershipPayment extends CRM_Member_DAO_MembershipPayment
 
 
   /**
-   * class constructor
+   * Class constructor
    */
-  function __construct() {
+  public function __construct() {
     parent::__construct();
   }
+
   /**
-   * function to add the membership Payments
+   * Add the membership Payments
    *
-   * @param array $params reference array contains the values submitted by the form
+   * @param array $params
+   *   Reference array contains the values submitted by the form.
    *
-   * @access public
-   * @static
    *
    * @return object
    */
-  static function create($params) {
+  public static function create($params) {
     $hook = empty($params['id']) ? 'create' : 'edit';
     CRM_Utils_Hook::pre($hook, 'MembershipPayment', CRM_Utils_Array::value('id', $params), $params);
     $dao = new CRM_Member_DAO_MembershipPayment();
@@ -67,26 +67,31 @@ class CRM_Member_BAO_MembershipPayment extends CRM_Member_DAO_MembershipPayment
     // table. However, at this stage we have both - there is still quite a bit of refactoring to do to set the line_iten entity_id right the first time
     // however, we can assume at this stage that any contribution id will have only one line item with that membership type in the line item table
     // OR the caller will have taken responsibility for updating the line items themselves so we will update using SQL here
-    $membershipTypeID = civicrm_api3('membership', 'getvalue', array('id' => $dao->membership_id, 'return' => 'membership_type_id'));
+    $membershipTypeID = civicrm_api3('membership', 'getvalue', array(
+        'id' => $dao->membership_id,
+        'return' => 'membership_type_id',
+      ));
     $sql = "UPDATE civicrm_line_item li
       LEFT JOIN civicrm_price_field_value pv ON pv.id = li.price_field_value_id
       SET entity_table = 'civicrm_membership', entity_id = %1
       WHERE pv.membership_type_id = %2
-      AND entity_table = 'civicrm_contribution' AND entity_id = contribution_id
       AND contribution_id = %3";
-    CRM_Core_DAO::executeQuery($sql, array(1 => array($dao->membership_id, 'Integer'), 2 => array($membershipTypeID, 'Integer'), 3 => array($dao->contribution_id, 'Integer')));
+    CRM_Core_DAO::executeQuery($sql, array(
+        1 => array($dao->membership_id, 'Integer'),
+        2 => array($membershipTypeID, 'Integer'),
+        3 => array($dao->contribution_id, 'Integer'),
+      ));
     return $dao;
   }
 
   /**
-   * Function to delete membership Payments
+   * Delete membership Payments
    *
    * @param int $id
    *
    * @return bool
-   * @static
    */
-  static function del($id) {
+  public static function del($id) {
     $dao = new CRM_Member_DAO_MembershipPayment();
     $dao->id = $id;
     $result = FALSE;
@@ -99,4 +104,3 @@ class CRM_Member_BAO_MembershipPayment extends CRM_Member_DAO_MembershipPayment
 
 
 }
-