Merge pull request #13393 from eileenmcnaughton/free

dev/core#562 remove calls to dao->free() from api folder
civicrm · Jan 7, 2019 · 46703d6 · 46703d6
2 parents 050e949 + b026ac8
commit 46703d6
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 9 deletions.
diff --git a/api/v3/Activity.php b/api/v3/Activity.php
@@ -105,9 +105,6 @@ function civicrm_api3_activity_create($params) {
         $activityDAO->id = $params['id'];
         $activityDAO->is_current_revision = 0;
         if (!$activityDAO->save()) {
-          if (is_object($activityDAO)) {
-            $activityDAO->free();
-          }
           throw new API_Exception(ts("Unable to revision existing case activity."));
         }
         $createRevision = TRUE;

diff --git a/api/v3/Mailing.php b/api/v3/Mailing.php
@@ -655,7 +655,6 @@ function civicrm_api3_mailing_send_test($params) {
         'email_id' => $dao->id,
       );
     }
-    $dao->free();
     foreach ($testEmailParams['emails'] as $key => $email) {
       $email = trim($email);
       $contactId = $emailId = NULL;

diff --git a/api/v3/MembershipStatus.php b/api/v3/MembershipStatus.php
@@ -173,10 +173,8 @@ function civicrm_api3_membership_status_calc($membershipParams) {
     }
   }
   else {
-    $dao->free();
     throw new API_Exception('did not find a membership record');
   }
-  $dao->free();
   return $result;
 }
 

diff --git a/api/v3/utils.php b/api/v3/utils.php
@@ -218,9 +218,6 @@ function civicrm_api3_create_success($values = 1, $params = array(), $entity = N
       $result['undefined_fields'] = array_merge($undefined);
     }
   }
-  if (is_object($dao)) {
-    $dao->free();
-  }
 
   $result['version'] = 3;
   if (is_array($values)) {