From 080071444db483ab24b59010e7138f7692139c55 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 25 Mar 2014 22:48:56 -0700
Subject: [PATCH] civicrm_api3_create_error, api/v3/Activity - Remove support
 for optional parameter, $dao

The option is only used in one place.
---
 api/v3/Activity.php | 3 +++
 api/v3/utils.php    | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/v3/Activity.php b/api/v3/Activity.php
index 79f62d2b94..02d55fd78f 100644
--- a/api/v3/Activity.php
+++ b/api/v3/Activity.php
@@ -111,6 +111,9 @@ function civicrm_api3_activity_create($params) {
         $activityDAO->id = $params['id'];
         $activityDAO->is_current_revision = 0;
         if (!$activityDAO->save()) {
+          if (is_object($activityDAO)) {
+            $activityDAO->free();
+          }
           return civicrm_api3_create_error(ts("Unable to revision existing case activity."), NULL, $activityDAO);
         }
         $createRevision = TRUE;
diff --git a/api/v3/utils.php b/api/v3/utils.php
index 8d66ea0d11..6084777033 100644
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -131,17 +131,12 @@ function civicrm_api3_verify_mandatory($params, $daoName = NULL, $keys = array()
  *
  * @param <type> $data
  * @param array $data
- * @param object $dao DAO / BAO object to be freed here
+ * @param array $dao (misnomer) apiRequest which led to this error (with keys "entity", "action", etc)
  *
  * @throws API_Exception
  * @return array <type>
  */
 function civicrm_api3_create_error($msg, $data = array(), &$dao = NULL) {
-  //fix me - $dao should be param 4 & 3 should be $apiRequest
-  if (is_object($dao)) {
-    $dao->free();
-  }
-
   if (is_array($dao)) {
     if ($msg == 'DB Error: constraint violation' || substr($msg, 0,9)  == 'DB Error:' || $msg == 'DB Error: already exists') {
       try {
-- 
2.25.1