From 278348dc1074d011eedcc100e0b53028ca4e7d4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Frank=20J=2E=20G=C3=B3mez?= Date: Thu, 5 Mar 2015 15:24:10 -0500 Subject: [PATCH] CRM-15965: Update search interface for 4.6 (deferred in 4.5). --- CRM/Contact/Form/Search/Custom.php | 6 +----- CRM/Contact/Form/Search/Interface.php | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CRM/Contact/Form/Search/Custom.php b/CRM/Contact/Form/Search/Custom.php index dfe38dff05..f2cf94cf9a 100644 --- 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 1105034430..5af876d768 100644 --- 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 -- 2.25.1