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

[civicrm-core.git] / api / v3 / Generic / Update.php

diff --git a/api/v3/Generic/Update.php b/api/v3/Generic/Update.php
index 1950e966dd376f1c688e1d6cdfcf8fd5995d67a4..3c37f70b548cef613f0da34491e19878e65652bc 100644 (file)
--- a/api/v3/Generic/Update.php
+++ b/api/v3/Generic/Update.php
@@ -1,5 +1,30 @@
 <?php
-// $Id$
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.4                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2013                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*/
 
 /**
  * Update function is basically a hack to get around issues listed in
@@ -18,13 +43,12 @@
  *  - 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
   // this is horrible but to make it work we'll just handle it separately
   if(strtolower($apiRequest['entity']) == 'contribution'){
@@ -36,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']);