From 7f880799891597812378453d905fb706d860c8d3 Mon Sep 17 00:00:00 2001
From: yashodha <yashodha.chaku@webaccess.co.in>
Date: Wed, 8 May 2013 05:31:33 +0530
Subject: [PATCH] more fixes

---
 CRM/Contribute/BAO/Contribution.php     | 20 ++++++++++++--------
 CRM/Contribute/BAO/ContributionSoft.php |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 9accdf2d50..5eb34ac41e 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -303,7 +303,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
     // Handle soft credit and / or link to personal campaign page
     list($type, $softIDs) = CRM_Contribute_BAO_ContributionSoft::getSoftCreditType($contribution->id);
     if ($pcp = CRM_Utils_Array::value('pcp', $params)) {
-      if ($type == 'soft') {
+      if (!empty($type) && $type == 'soft') {
         $deleteParams = array('contribution_id' => $contribution->id);
         CRM_Contribute_BAO_ContributionSoft::del($deleteParams);
       }
@@ -322,19 +322,23 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
     }
     elseif (CRM_Utils_Array::value('soft_credit', $params)) {
       $softParams = $params['soft_credit'];
-      foreach ( $softIDs as $softID) {
-        if (!in_array($softID, $params['soft_credit_ids'])) {
-          $deleteParams = array('id' => $softID);
-          CRM_Contribute_BAO_ContributionSoft::del($deleteParams);
+
+      if (!empty($softIDs)) {
+        foreach ( $softIDs as $softID) {
+          if (!in_array($softID, $params['soft_credit_ids'])) {
+            $deleteParams = array('id' => $softID);
+            CRM_Contribute_BAO_ContributionSoft::del($deleteParams);
+          }
         }
       }
 
       foreach ($softParams as $softParam) {
         $softParam['contribution_id'] = $contribution->id;
         $softParam['currency'] = $contribution->currency;
-        $softParam['pcp_display_in_roll'] = NULL;
-        $softParam['pcp_roll_nickname'] = NULL;
-        $softParam['pcp_personal_note'] = NULL;
+        $softParam['pcp_id'] = 'null';
+        $softParam['pcp_display_in_roll'] = 'null';
+        $softParam['pcp_roll_nickname'] = 'null';
+        $softParam['pcp_personal_note'] = 'NULL';
         CRM_Contribute_BAO_ContributionSoft::add($softParam);
       }
     }
diff --git a/CRM/Contribute/BAO/ContributionSoft.php b/CRM/Contribute/BAO/ContributionSoft.php
index f65d066125..b44489ad35 100644
--- a/CRM/Contribute/BAO/ContributionSoft.php
+++ b/CRM/Contribute/BAO/ContributionSoft.php
@@ -218,6 +218,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio
 
     $dao = CRM_Core_DAO::executeQuery($query, $params);
     $id = array();
+    $type = '';
     while ($dao->fetch()) {
       if ($dao->pcp_id) {
         $type = 'pcp';
-- 
2.25.1