From: Donald A. Lobo <lobo@civicrm.org>
Date: Fri, 2 Aug 2013 17:02:50 +0000 (-0700)
Subject: CRM-13127
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ad3f841db0eec307ddcc5c30812eb74e37eef5da;p=civicrm-core.git

CRM-13127

----------------------------------------
* CRM-13127: test should include isset in API contact.php
  http://issues.civicrm.org/jira/browse/CRM-13127
---

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index e9fa2b4baa..62ec6a18ca 100644
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -298,7 +298,7 @@ function civicrm_api3_contact_delete($params) {
   // restrict permanent delete if a contact has financial trxn associated with it
   $error = NULL;
   if ($skipUndelete && CRM_Financial_BAO_FinancialItem::checkContactPresent(array($contactID), $error)) {
-    return civicrm_api3_create_error($error['_qf_default']);  
+    return civicrm_api3_create_error($error['_qf_default']);
   }
   if (CRM_Contact_BAO_Contact::deleteContact($contactID, $restore, $skipUndelete)) {
     return civicrm_api3_create_success();
@@ -496,10 +496,13 @@ function _civicrm_api3_greeting_format_params($params) {
       $greetingId = CRM_Utils_Array::key('Customized', $greetings);
     }
 
-    $customValue = $params['contact_id'] ? CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact',
-      $params['contact_id'],
-      "{$key}{$greeting}_custom"
-    ) : FALSE;
+    $customValue = isset($params['contact_id']) ?
+      CRM_Core_DAO::getFieldValue(
+        'CRM_Contact_DAO_Contact',
+        $params['contact_id'],
+        "{$key}{$greeting}_custom"
+      ) :
+      FALSE;
 
     if (array_key_exists("{$key}{$greeting}_id", $params) && empty($params["{$key}{$greeting}_id"])) {
       $nullValue = TRUE;