CRM-18472: notice fixes

diff --git a/CRM/Contribute/BAO/ContributionSoft.php b/CRM/Contribute/BAO/ContributionSoft.php
index 5d835e957009dfa58aab365a06af6d381b864cdf..ced6fd4d1cecba6fef6d0a27c92bfa621cc47658 100644 (file)
--- a/CRM/Contribute/BAO/ContributionSoft.php
+++ b/CRM/Contribute/BAO/ContributionSoft.php
@@ -230,7 +230,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio
   public static function del($params) {
     //delete from contribution soft table
     $contributionSoft = new CRM_Contribute_DAO_ContributionSoft();
-    $contributionSoft->id = $params['id'];
+    $contributionSoft->id = CRM_Utils_Array::value('id', $params);
     if (!$contributionSoft->find()) {
       return FALSE;
     }

diff --git a/tests/phpunit/CiviTest/CiviMailUtils.php b/tests/phpunit/CiviTest/CiviMailUtils.php
index 3c3dadf09da6c964d1632ed11fb3d0e48fab9609..5ef5280f7a5a4d55eab53da2ba383f991f4a9b0e 100644 (file)
--- a/tests/phpunit/CiviTest/CiviMailUtils.php
+++ b/tests/phpunit/CiviTest/CiviMailUtils.php
@@ -191,7 +191,7 @@ class CiviMailUtils extends PHPUnit_Framework_TestCase {
     $msgs = array();
 
     if ($this->_webtest) {
-      throw new Exception("Not implementated: getAllMessages for WebTest");
+      throw new Exception("Not implemented: getAllMessages for WebTest");
     }
     else {
       $dao = CRM_Core_DAO::executeQuery('SELECT headers, body FROM civicrm_mailing_spool ORDER BY id');
@@ -336,7 +336,7 @@ class CiviMailUtils extends PHPUnit_Framework_TestCase {
    */
   public function clearMessages($limit = 1) {
     if ($this->_webtest) {
-      throw new Exception("Not implementated: clearMessages for WebTest");
+      throw new Exception("Not implemented: clearMessages for WebTest");
     }
     else {
       CRM_Core_DAO::executeQuery('DELETE FROM civicrm_mailing_spool ORDER BY id DESC LIMIT ' . $limit);