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

Conflicts:
	CRM/Member/Form/MembershipRenewal.php

diff --cc CRM/Contact/BAO/ProximityQuery.php
Simple merge

diff --cc CRM/Group/Page/AJAX.php
index 1ae0f5a672fd33b2505c63e4ddbf524600367ff9,0f897a04a094bb8d66d92bf742cd1a19167d96da..fef31e7fe3637e5b6a8a82ba569ef76cc1aeb6bf
--- 1/CRM/Group/Page/AJAX.php
--- 2/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 64a8ae2905ddc101d859b0b12a592ddfe0f1d623,da5e5208dd48cc318da070c07e8440c2d84b8ad1..cc3a1c53bcfb7fd99549cd950061922ff8a264f1
--- 1/CRM/Member/Form/MembershipRenewal.php
--- 2/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'];

diff --cc xml/templates/civicrm_data.tpl
Simple merge