ignore uf_join module for reserved profiles CRM-14488

[civicrm-core.git] / CRM / Core / BAO / UFField.php

diff --git a/CRM/Core/BAO/UFField.php b/CRM/Core/BAO/UFField.php
index 5baa73671e399e9a492f0813042e0e83704b22ff..843e97c38f8ea421a9e07cf6b9f3d00e6f485f35 100644 (file)
--- a/CRM/Core/BAO/UFField.php
+++ b/CRM/Core/BAO/UFField.php
@@ -142,7 +142,7 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField {
     $ufField->field_name = $params['field_name'][1];
     if ($params['field_name'][1] == 'url') {
       $ufField->website_type_id = CRM_Utils_Array::value(2, $params['field_name'], NULL);
-    } 
+    }
     else {
       $ufField->location_type_id = (CRM_Utils_Array::value(2, $params['field_name'])) ? $params['field_name'][2] : 'NULL';
     }
@@ -219,7 +219,7 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1";
     $locationTypeId = NULL;
     if ($params['field_name'][1] == 'url') {
       $ufField->website_type_id = CRM_Utils_Array::value(2, $params['field_name']);
-    } 
+    }
     else {
       $locationTypeId = CRM_Utils_Array::value(2, $params['field_name']);
       $ufField->website_type_id = NULL;
@@ -808,7 +808,11 @@ SELECT  id
     $billing_id = CRM_Core_BAO_LocationType::getBilling();
     list($prefixName, $index) = CRM_Utils_System::explode('-', $key, 2);
 
-    $profileFields = civicrm_api3('uf_field', 'get', array_merge($profileFilter, array('is_active' => 1, 'return' => 'field_name')));
+    $profileFields = civicrm_api3('uf_field', 'get', array_merge($profileFilter,
+      array('is_active' => 1, 'return' => 'field_name', 'options' => array(
+        'limit' => 0,
+      ))
+    ));
     //check for valid fields ( fields that are present in billing block )
     $validBillingFields = array(
       'first_name',
@@ -929,12 +933,7 @@ SELECT  id
           'name' => 'contribution_note',
           'title' => ts('Contribution Note'),
         );
-        if ($gid && CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFGroup', $gid, 'name') == 'contribution_batch_entry') {
-          $fields['Contribution'] = array_merge($contribFields, self::getContribBatchEntryFields());
-        }
-        else {
-          $fields['Contribution'] = $contribFields;
-        }
+        $fields['Contribution'] = array_merge($contribFields, self::getContribBatchEntryFields());
       }
     }
 
@@ -1094,6 +1093,10 @@ SELECT  id
           'name' => 'soft_credit',
           'title' => ts('Soft Credit'),
         ),
+        'soft_credit_type' => array(
+          'name' => 'soft_credit_type',
+          'title' => ts('Soft Credit Type'),
+        ),
         'product_name' => array(
           'name' => 'product_name',
           'title' => ts('Premiums'),