CRM-15965: Update search interface for 4.6 (deferred in 4.5).

diff --git a/CRM/Contact/Form/Search/Custom.php b/CRM/Contact/Form/Search/Custom.php
index dfe38dff059e44b3273e4ad2eba3b1c44b16bb64..f2cf94cf9a682f79478d21a41498ac0045735872 100644 (file)
--- a/CRM/Contact/Form/Search/Custom.php
+++ b/CRM/Contact/Form/Search/Custom.php
@@ -121,11 +121,7 @@ class CRM_Contact_Form_Search_Custom extends CRM_Contact_Form_Search {
     // call the parent method to populate $this->_taskList for the custom search
     parent::buildTaskList();
 
-    // @todo: When CRM_Contact_Form_Search_Interface is updated in 4.6, remove this check
-    if (is_callable(array($this->_customClass, 'buildTaskList'))) {
-      return $this->_customClass->buildTaskList($this);
-    } else {
-      return $this->_taskList;
+    return $this->_customClass->buildTaskList($this);
     }
   }
 

diff --git a/CRM/Contact/Form/Search/Interface.php b/CRM/Contact/Form/Search/Interface.php
index 110503443011f2ead579b2ad8042c85aefe6c58a..5af876d76874113f782066362c0f46d905b2477d 100644 (file)
--- a/CRM/Contact/Form/Search/Interface.php
+++ b/CRM/Contact/Form/Search/Interface.php
@@ -47,8 +47,7 @@ interface CRM_Contact_Form_Search_Interface {
    * @param CRM_Core_Form_Search $form
    * @return array
    */
-  // @todo: This interface change should not go into a minor version; save for 4.6
-  // public function buildTaskList(CRM_Core_Form_Search $form);
+  public function buildTaskList(CRM_Core_Form_Search $form);
 
   /**
    * Builds the quickform for this search