Merge pull request #13134 from agileware/CIVICRM-1006

[civicrm-core.git] / CRM / Core / SelectValues.php

diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index f5f0de0492f30d59f225165a5178b3b1fbc7b1d2..87b08e890f2393507f1948b21660f8caea1ae465 100644 (file)
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -31,7 +31,7 @@
  * smart caching scheme on a per domain basis
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  * $Id$
  *
  */
@@ -1145,12 +1145,13 @@ class CRM_Core_SelectValues {
       'job_title' => ts('Job Title'),
     ];
     $custom = civicrm_api3('CustomField', 'get', [
-      'return' => ["name", "label", "custom_group_id.title"],
-      'custom_group_id.extends' => ['IN' => ["Contact", "Individual", "Organization", "Household"]],
+      'return' => ['name', 'label', 'custom_group_id.title'],
+      'custom_group_id.extends' => ['IN' => ['Contact', 'Individual', 'Organization', 'Household']],
+      'data_type' => ['NOT IN' => ['ContactReference', 'Date', 'File']],
       'custom_group_id.is_active' => 1,
       'is_active' => 1,
       'is_searchable' => 1,
-      'options' => ['sort' => ['custom_group_id.weight', 'weight']],
+      'options' => ['sort' => ['custom_group_id.weight', 'weight'], 'limit' => 0],
     ]);
     foreach ($custom['values'] as $field) {
       $options['custom_' . $field['name']] = $field['custom_group_id.title'] . ': ' . $field['label'];