Annotate DAO files with COMPONENT, exclude disabled components' entities from APIv4...

[civicrm-core.git] / CRM / Core / Form / Search.php

diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php
index 4dc1b95db36494e4994fd7968c28b9204eb7c4c2..0a9969685f7b4908ec3b0e8060c368849c008ee8 100644 (file)
--- a/CRM/Core/Form/Search.php
+++ b/CRM/Core/Form/Search.php
@@ -21,13 +21,6 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
    */
   protected $_force;
 
-  /**
-   * Name of search button
-   *
-   * @var string
-   */
-  protected $_searchButtonName;
-
   /**
    * Name of action button
    *
@@ -209,6 +202,9 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
           if (isset($fields[$fieldName]['unique_title'])) {
             $props['label'] = $fields[$fieldName]['unique_title'];
           }
+          elseif (isset($fields[$fieldName]['html']['label'])) {
+            $props['label'] = $fields[$fieldName]['html']['label'];
+          }
           elseif (isset($fields[$fieldName]['title'])) {
             $props['label'] = $fields[$fieldName]['title'];
           }