Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-25-17-38-49

[civicrm-core.git] / api / v3 / CustomValue.php

diff --git a/api/v3/CustomValue.php b/api/v3/CustomValue.php
index 2ad7bc96af02574a8aef9f087249d82c39398f03..ab3275faf850288e9ebea5cd66f5c5cbee319cc8 100644 (file)
--- a/api/v3/CustomValue.php
+++ b/api/v3/CustomValue.php
@@ -176,7 +176,7 @@ function civicrm_api3_custom_value_get($params) {
       return civicrm_api3_create_success($values, $params);
     }
     else {
-      return civicrm_api3_create_error($result['error_message']);
+      throw new API_Exception($result['error_message']);
     }
   }
   else {
@@ -194,7 +194,8 @@ function civicrm_api3_custom_value_get($params) {
         continue;
       }
       $fieldNumber = $idArray[1];
-      $info = array_pop(CRM_Core_BAO_CustomField::getNameFromID($fieldNumber));
+      $customFieldInfo = CRM_Core_BAO_CustomField::getNameFromID($fieldNumber);
+      $info = array_pop($customFieldInfo);
       // id is the index for returned results
 
       if (empty($idArray[2])) {
@@ -205,14 +206,14 @@ function civicrm_api3_custom_value_get($params) {
         $n = $idArray[2];
         $id = $fieldNumber . "." . $idArray[2];
       }
-      if (CRM_Utils_Array::value('format.field_names', $params)) {
+      if (!empty($params['format.field_names'])) {
         $id = $info['field_name'];
       }
       else {
         $id = $fieldNumber;
       }
       $values[$id]['entity_id'] = $getParams['entityID'];
-      if (CRM_Utils_Array::value('entityType', $getParams)) {
+      if (!empty($getParams['entityType'])) {
         $values[$n]['entity_table'] = $getParams['entityType'];
       }
       //set 'latest' -useful for multi fields but set for single for consistency