From d31f1ab3829a6f1ee0221d595c46330971728b16 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Wed, 9 Oct 2013 14:34:36 -0400
Subject: [PATCH] fix for returning to custom search from new activity task

---
 CRM/Activity/Form/Activity.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index d6ba8bc14d..c48061752e 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -415,18 +415,16 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
         $urlParams .= "&qfKey=$qfKey";
       }
       $path = CRM_Utils_System::currentPath();
-      if ($this->_compContext == 'advanced' ||
-        $path == 'civicrm/contact/search/advanced'
-      ) {
+      if ($this->_compContext == 'advanced' ) {
         $urlString = 'civicrm/contact/search/advanced';
       }
+      elseif ($path == 'civicrm/contact/search'
+        || $path == 'civicrm/contact/search/advanced'
+        || $path == 'civicrm/contact/search/custom') {
+        $urlString = $path;
+      }
       else {
-        if ($path == 'civicrm/contact/search') {
-          $urlString = 'civicrm/contact/search';
-        }
-        else {
-          $urlString = 'civicrm/activity/search';
-        }
+        $urlString = 'civicrm/activity/search';
       }
       $this->assign('searchKey', $qfKey);
     }
-- 
2.25.1