From: kurund <kurund@civicrm.org>
Date: Tue, 12 Aug 2014 05:44:51 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-12-10-27-52
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9d0857e01495c77accb2c7a2ee34ec4573261b24;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-12-10-27-52

Conflicts:
	CRM/Member/Form/MembershipRenewal.php
---

9d0857e01495c77accb2c7a2ee34ec4573261b24
diff --cc CRM/Group/Page/AJAX.php
index 1ae0f5a672,0f897a04a0..fef31e7fe3
--- a/CRM/Group/Page/AJAX.php
+++ b/CRM/Group/Page/AJAX.php
@@@ -39,10 -39,10 +39,10 @@@ class CRM_Group_Page_AJAX 
    static function getGroupList() {
      $params = $_REQUEST;
  
 -    if ( isset($params['parent_id']) ) {
 +    if (isset($params['parent_id'])) {
        // requesting child groups for a given parent
        $params['page'] = 1;
-       $params['rp']   = 25;
+       $params['rp']   = 0;
        $groups = CRM_Contact_BAO_Group::getGroupListSelector($params);
  
        echo json_encode($groups);
diff --cc CRM/Member/Form/MembershipRenewal.php
index 64a8ae2905,da5e5208dd..cc3a1c53bc
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@@ -788,16 -790,8 +788,8 @@@ WHERE   id IN ( ' . implode(' , ', arra
        CRM_Member_BAO_Membership::recordMembershipContribution(array_merge($formValues, array('membership_id' => $renewMembership->id)));
      }
  
-     if (!empty($formValues['send_receipt'])) {
-       CRM_Core_DAO::setFieldValue('CRM_Member_DAO_MembershipType',
-         $formValues['membership_type_id'][1],
-         'receipt_text_renewal',
-         $formValues['receipt_text_renewal']
-       );
-     }
- 
      $receiptSend = FALSE;
 -    if (CRM_Utils_Array::value('send_receipt', $formValues)) {
 +    if (!empty($formValues['send_receipt'])) {
        $receiptSend = TRUE;
  
        $receiptFrom = $formValues['from_email_address'];