Merge pull request #9558 from yashodha/CRM-18472

CRM-18472: notice fixes
civicrm · Dec 19, 2016 · b74fe88 · b74fe88
2 parents 961c10e + c0f9acf
commit b74fe88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Contribute/BAO/ContributionSoft.php b/CRM/Contribute/BAO/ContributionSoft.php
@@ -230,7 +230,7 @@ public static function retrieve(&$params, &$defaults) {
   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
@@ -191,7 +191,7 @@ public function getAllMessages($type = 'raw') {
     $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 @@ public function assertSubjects($expectedSubjects) {
    */
   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);