core/issues/64 - In custom searches, column headings are being ignored

diff --git a/CRM/Contact/StateMachine/Search.php b/CRM/Contact/StateMachine/Search.php
index ce90bb0d82a1bd1d9a99737387a886d4cec0582d..76df5c3598329a7cc4b21c7841f6222aa1c18f29 100644 (file)
--- a/CRM/Contact/StateMachine/Search.php
+++ b/CRM/Contact/StateMachine/Search.php
@@ -103,10 +103,13 @@ class CRM_Contact_StateMachine_Search extends CRM_Core_StateMachine {
     }
     $this->_controller->set('task', $value);
 
-    $componentMode = $this->_controller->get('component_mode');
-    $modeValue = CRM_Contact_Form_Search::getModeValue($componentMode);
-    $taskClassName = $modeValue['taskClassName'];
-    return $taskClassName::getTask($value);
+    if ($value) {
+      $componentMode = $this->_controller->get('component_mode');
+      $modeValue = CRM_Contact_Form_Search::getModeValue($componentMode);
+      $taskClassName = $modeValue['taskClassName'];
+      return $taskClassName::getTask($value);
+    }
+    return CRM_Contact_Task::getTask($value);
   }
 
   /**