Merge pull request #2362 from totten/4.4-sync-redirect

[civicrm-core.git] / CRM / Core / BAO / CustomField.php

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index f2ad275a4b1e41152742ae58af3a0050e60c6bb3..c56c9a943398f29f6dc2c4e46736965746e9edf5 100644 (file)
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -742,13 +742,13 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
     }
 
     $field = self::getFieldObject($fieldId);
-    
+
     // Custom field HTML should indicate group+field name
     $groupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $field->custom_group_id);
     $dataCrmCustomVal = $groupName.':'.$field->name;
     $dataCrmCustomAttr = 'data-crm-custom="'.$dataCrmCustomVal.'"';
     $field->attributes .= $dataCrmCustomAttr;
-    
+
     // Fixed for Issue CRM-2183
     if ($field->html_type == 'TextArea' && $search) {
       $field->html_type = 'Text';
@@ -831,7 +831,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
               'timeFormat' => $field->time_format,
               'startOffset' => $field->start_date_years,
               'endOffset' => $field->end_date_years,
-                 'data-crm-custom' => $dataCrmCustomVal,
+              'data-crm-custom' => $dataCrmCustomVal,
             ));
         }
         break;
@@ -889,7 +889,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
             'size' => 5,
             'style' => '',
             'class' => 'advmultiselect',
-               'data-crm-custom' => $dataCrmCustomVal,
+            'data-crm-custom' => $dataCrmCustomVal,
           )
         );
 
@@ -1180,7 +1180,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
           if ($value) {
             $display = ts('Yes');
           }
-          elseif ($value === '0') {
+          elseif ((string)$value === '0') {
             $display = ts('No');
           }
         }
@@ -1345,7 +1345,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
           $display = $value;
         }
     }
-
     return $display ? $display : $value;
   }
 
@@ -1558,7 +1557,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
     if (is_array($customFieldExtend)) {
       $customFieldExtend = $customFieldExtend[0];
     }
-    
+
     if (in_array($customFieldExtend,
         CRM_Contact_BAO_ContactType::subTypes()
       )) {