Merge pull request #25847 from civicrm/5.60

5.60

CRM/Case/Form/Case.php

@@ -200,7 +200,7 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
    */
   public function setDefaultValues() {
     if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW) {
-      return TRUE;
+      return [];
     }
     $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";
     $defaults = $className::setDefaultValues($this);

CRM/Contribute/BAO/ContributionSoft.php

@@ -391,10 +391,10 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio
     // This is necessary for dataTables sorting.
     $dataTableMapping = [
       'sct_label' => 'soft_credit_type_id:label',
-      'contributor_name' => 'contact.sort_name',
+      'contributor_name' => 'contact_id.sort_name',
       'financial_type' => 'contribution_id.financial_type_id:label',
       'contribution_status' => 'contribution_id.contribution_status_id:label',
-      'receive_date' => 'contribution.receive_date',
+      'receive_date' => 'contribution_id.receive_date',
       'pcp_title' => 'pcp_id.title',
       'amount' => 'amount',
     ];