Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

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

diff --git a/CRM/Core/BAO/CustomValue.php b/CRM/Core/BAO/CustomValue.php
index 32e56cbd7aa517b105bcd4b3ff615f493c63f25c..bc4e0ccc472d0a3854aef812ddbf6ebfae677d87 100644 (file)
--- a/CRM/Core/BAO/CustomValue.php
+++ b/CRM/Core/BAO/CustomValue.php
@@ -160,6 +160,9 @@ class CRM_Core_BAO_CustomValue extends CRM_Core_DAO {
   }
 
 
+  /**
+   * @param $formValues
+   */
   public static function fixFieldValueOfTypeMemo(&$formValues) {
     if (empty($formValues)) {
       return NULL;
@@ -183,12 +186,6 @@ class CRM_Core_BAO_CustomValue extends CRM_Core_DAO {
         $formValues[$key] = '%' . $formValues[$key] . '%';
       }
 
-      $dataType = CRM_Core_DAO::getFieldValue('CRM_Core_BAO_CustomField',
-        substr($key, 7), 'data_type'
-      );
-      if (($dataType == 'ContactReference') && ($htmlType == 'Autocomplete-Select')) {
-        $formValues[$key] = $formValues[$key . '_id'];
-      }
     }
   }
 
@@ -215,4 +212,4 @@ class CRM_Core_BAO_CustomValue extends CRM_Core_DAO {
       $customValueID
     );
   }
-}
\ No newline at end of file
+}