X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FForm%2FSearch.php;h=cd650775fa541bc56cbc31f61ad6bc82abdad951;hb=a13f3d8c01e114b11c381b6ac3e64becae9380b1;hp=2acc04af1dc431edfb18b0869ebacb9247da792b;hpb=973535196eeb576136587c194710bc648df9946c;p=civicrm-core.git

diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php
index 2acc04af1d..cd650775fa 100644
--- a/CRM/Core/Form/Search.php
+++ b/CRM/Core/Form/Search.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -33,46 +33,40 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
    * Are we forced to run a search
    *
    * @var int
-   * @access protected
    */
   protected $_force;
 
   /**
-   * name of search button
+   * Name of search button
    *
    * @var string
-   * @access protected
    */
   protected $_searchButtonName;
 
   /**
-   * name of action button
+   * Name of action button
    *
    * @var string
-   * @access protected
    */
   protected $_actionButtonName;
 
   /**
-   * form values that we will be using
+   * Form values that we will be using
    *
    * @var array
-   * @access public
    */
   public $_formValues;
 
   /**
-   * have we already done this search
+   * Have we already done this search
    *
-   * @access protected
    * @var boolean
    */
   protected $_done;
 
   /**
-   * what context are we being invoked from
+   * What context are we being invoked from
    *
-   * @access protected
    * @var string
    */
   protected $_context = NULL;
@@ -80,16 +74,15 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
   /**
    * Common buildform tasks required by all searches
    */
-  function buildQuickform() {
+  public function buildQuickform() {
     $resources = CRM_Core_Resources::singleton();
 
     if ($resources->ajaxPopupsEnabled) {
-      $resources->addScriptFile('civicrm', 'js/crm.livePage.js');
       // Script needed by some popups
       $this->assign('includeWysiwygEditor', TRUE);
     }
 
-    $resources->addScriptFile('civicrm', 'js/crm.searchForm.js');
+    $resources->addScriptFile('civicrm', 'js/crm.searchForm.js', 1, 'html-header');
 
     $this->addButtons(array(
       array(
@@ -105,7 +98,7 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
   /**
    * Add checkboxes for each row plus a master checkbox
    */
-  function addRowSelectors($rows) {
+  public function addRowSelectors($rows) {
     $this->addElement('checkbox', 'toggleSelect', NULL, NULL, array('class' => 'select-rows'));
     foreach ($rows as $row) {
       $this->addElement('checkbox', $row['checkbox'], NULL, NULL, array('class' => 'select-row'));
@@ -116,7 +109,7 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
    * Add actions menu to search results form
    * @param $tasks
    */
-  function addTaskMenu($tasks) {
+  public function addTaskMenu($tasks) {
     if (is_array($tasks) && !empty($tasks)) {
       $tasks = array('' => ts('Actions')) + $tasks;
       $this->add('select', 'task', NULL, $tasks, FALSE, array('class' => 'crm-select2 crm-action-menu huge crm-search-result-actions'));