CRM-12213

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index bee06e27af8c2ff976714a9ab56299f45674de3a..f5ebf354e798f5a627155fb885dda2f757085f36 100644 (file)
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -372,7 +372,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
 
     // set user context
     $urlParams = $urlString = NULL;
-    $qfKey = CRM_Utils_Request::retrieve('key', 'String', $this);
+    $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
 
     //validate the qfKey
     if (!CRM_Utils_Rule::qfKey($qfKey)) {
@@ -403,9 +403,14 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
       if ($qfKey) {
         $urlParams .= "&qfKey=$qfKey";
       }
-      if ($this->_compContext == 'advanced') {
+      $path = CRM_Utils_System::currentPath();
+      if ($this->_compContext == 'advanced' || 
+        $path == 'civicrm/contact/search/advanced') {
         $urlString = 'civicrm/contact/search/advanced';
       }
+      else if ($path == 'civicrm/contact/search') {
+        $urlString = 'civicrm/contact/search';
+      }
       else {
         $urlString = 'civicrm/activity/search';
       }