From: Tim Otten <totten@civicrm.org>
Date: Wed, 26 Mar 2014 05:44:18 +0000 (-0700)
Subject: civicrm_api3_create_error, api/v3/Generic/Update - Remove unnecessary indirection
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b1cb6336602834ff0562429ddcf254c703804179;p=civicrm-core.git

civicrm_api3_create_error, api/v3/Generic/Update - Remove unnecessary indirection
---

diff --git a/api/v3/Generic/Update.php b/api/v3/Generic/Update.php
index 1c95bcae6a..3c37f70b54 100644
--- a/api/v3/Generic/Update.php
+++ b/api/v3/Generic/Update.php
@@ -43,12 +43,10 @@
  *  - params: array, varies
  */
 function civicrm_api3_generic_update($apiRequest) {
-  $errorFnName = 'civicrm_api3_create_error';
-
   //$key_id = strtolower ($apiRequest['entity'])."_id";
   $key_id = "id";
   if (!array_key_exists($key_id, $apiRequest['params'])) {
-    return $errorFnName("Mandatory parameter missing $key_id");
+    return civicrm_api3_create_error("Mandatory parameter missing $key_id");
   }
   // @fixme
   // tests show that contribution works better with create
@@ -62,10 +60,10 @@ function civicrm_api3_generic_update($apiRequest) {
     return $existing;
   }
   if ($existing['count'] > 1) {
-    return $errorFnName("More than one " . $apiRequest['entity'] . " with id " . $apiRequest['params'][$key_id]);
+    return civicrm_api3_create_error("More than one " . $apiRequest['entity'] . " with id " . $apiRequest['params'][$key_id]);
   }
   if ($existing['count'] == 0) {
-    return $errorFnName("No " . $apiRequest['entity'] . " with id " . $apiRequest['params'][$key_id]);
+    return civicrm_api3_create_error("No " . $apiRequest['entity'] . " with id " . $apiRequest['params'][$key_id]);
   }
 
   $existing = array_pop($existing['values']);