CRM-12282

----------------------------------------
* CRM-12282: Activity Delete gives an invalid key error
  http://issues.civicrm.org/jira/browse/CRM-12282

diff --git a/CRM/Activity/Page/Tab.php b/CRM/Activity/Page/Tab.php
index a84e2eb43f90ce7ae5d50b2d9344815c762aa5b1..f2b81c54adc8859fdae8a94c7a7eeeb717c84834 100644 (file)
--- a/CRM/Activity/Page/Tab.php
+++ b/CRM/Activity/Page/Tab.php
@@ -51,8 +51,11 @@ class CRM_Activity_Page_Tab extends CRM_Core_Page {
     $this->assign('context', 'activity');
 
     // also create the form element for the activity filter box
-    $controller = new CRM_Core_Controller_Simple('CRM_Activity_Form_ActivityFilter',
-      ts('Activity Filter'), NULL
+    $controller = new CRM_Core_Controller_Simple(
+      'CRM_Activity_Form_ActivityFilter',
+      ts('Activity Filter'),
+      NULL,
+      FALSE, FALSE, TRUE
     );
     $controller->set('contactId', $this->_contactId);
     $controller->setEmbedded(TRUE);
@@ -138,15 +141,19 @@ class CRM_Activity_Page_Tab extends CRM_Core_Page {
     $this->assign('action', $this->_action);
 
     // also create the form element for the activity links box
-    $controller = new CRM_Core_Controller_Simple('CRM_Activity_Form_ActivityLinks',
-      ts('Activity Links'), NULL
+    $controller = new CRM_Core_Controller_Simple(
+      'CRM_Activity_Form_ActivityLinks',
+      ts('Activity Links'),
+      NULL,
+      FALSE, FALSE, TRUE
     );
     $controller->setEmbedded(TRUE);
     $controller->run();
   }
 
   function delete() {
-    $controller = new CRM_Core_Controller_Simple('CRM_Activity_Form_Activity',
+    $controller = new CRM_Core_Controller_Simple(
+      'CRM_Activity_Form_Activity',
       ts('Activity Record'),
       $this->_action
     );