send most action links thru hook_civicrm_links
authorAndrew Hunt <andrew@aghstrategies.com>
Thu, 24 Oct 2013 18:58:58 +0000 (14:58 -0400)
committerAndrew Hunt <andrew@aghstrategies.com>
Thu, 24 Oct 2013 18:58:58 +0000 (14:58 -0400)
79 files changed:
CRM/ACL/Page/ACL.php
CRM/ACL/Page/ACLBasic.php
CRM/ACL/Page/EntityRole.php
CRM/Activity/BAO/Activity.php
CRM/Activity/Selector/Activity.php
CRM/Activity/Selector/Search.php
CRM/Admin/Form/ScheduleReminders.php
CRM/Admin/Page/ContactType.php
CRM/Admin/Page/EventTemplate.php
CRM/Admin/Page/Extensions.php
CRM/Admin/Page/Job.php
CRM/Admin/Page/LabelFormats.php
CRM/Admin/Page/MailSettings.php
CRM/Admin/Page/MessageTemplates.php
CRM/Admin/Page/OptionValue.php
CRM/Admin/Page/ParticipantStatus.php
CRM/Admin/Page/PaymentProcessor.php
CRM/Admin/Page/PdfFormats.php
CRM/Admin/Page/Persistent.php
CRM/Admin/Page/ScheduleReminders.php
CRM/Batch/BAO/Batch.php
CRM/Campaign/Page/Campaign.php
CRM/Campaign/Page/DashBoard.php
CRM/Campaign/Page/Survey.php
CRM/Case/BAO/Case.php
CRM/Case/Selector/Search.php
CRM/Contact/BAO/Group.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Form/Contact.php
CRM/Contact/Page/DedupeRules.php
CRM/Contact/Page/SavedSearch.php
CRM/Contact/Page/View/Note.php
CRM/Contact/Selector.php
CRM/Contact/Selector/Custom.php
CRM/Contribute/Page/ContributionPage.php
CRM/Contribute/Page/ManagePremiums.php
CRM/Contribute/Page/Premium.php
CRM/Contribute/Page/Tab.php
CRM/Contribute/Page/UserDashboard.php
CRM/Contribute/Selector/Search.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/BAO/UFGroup.php
CRM/Core/OptionValue.php
CRM/Custom/Page/Field.php
CRM/Custom/Page/Group.php
CRM/Custom/Page/Option.php
CRM/Event/Form/ManageEvent/ScheduleReminders.php
CRM/Event/Page/ManageEvent.php
CRM/Event/Selector/Search.php
CRM/Financial/Page/AJAX.php
CRM/Financial/Page/FinancialAccount.php
CRM/Financial/Page/FinancialType.php
CRM/Financial/Page/FinancialTypeAccount.php
CRM/Grant/Selector/Search.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/Selector/Search.php
CRM/Member/Form/MembershipView.php
CRM/Member/Page/MembershipStatus.php
CRM/Member/Page/MembershipType.php
CRM/Member/Page/Tab.php
CRM/Member/Selector/Search.php
CRM/PCP/BAO/PCP.php
CRM/PCP/Page/PCP.php
CRM/Pledge/Selector/Search.php
CRM/Price/Page/Field.php
CRM/Price/Page/Option.php
CRM/Price/Page/Set.php
CRM/Profile/Page/MultipleRecordFieldsListing.php
CRM/Profile/Selector/Listings.php
CRM/SMS/Page/Provider.php
CRM/UF/Page/Field.php
CRM/UF/Page/Group.php
CRM/Utils/Hook.php
CRM/Utils/Hook/Drupal.php
CRM/Utils/Hook/Drupal6.php
CRM/Utils/Hook/Joomla.php
CRM/Utils/Hook/Soap.php
CRM/Utils/Hook/UnitTests.php
CRM/Utils/Hook/WordPress.php

index 72dc12e86fcd0710a88b5f069632ab6a30d75147..aa1974966089b62851dfbd40c3169410dad2429c 100644 (file)
@@ -236,8 +236,15 @@ ORDER BY entity_id
         $action -= CRM_Core_Action::DISABLE;
       }
 
-      $acl[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $dao->id)
+      $acl[$dao->id]['action'] = CRM_Core_Action::formLink(
+        self::links(),
+        $action,
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'ACL.manage.action',
+        'ACL',
+        $dao->id
       );
     }
     $this->assign('rows', $acl);
index 5a1c335ce40813cfbafd3de40bc88b6f4a6cfb18..7c3334d83fd891e0e411c4b54d16a0a2c3f02cae 100644 (file)
@@ -169,8 +169,15 @@ ORDER BY entity_id
         // form all action links
         $action = array_sum(array_keys($this->links()));
 
-        $acl[$dao->entity_id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-          array('id' => $dao->entity_id)
+        $acl[$dao->entity_id]['action'] = CRM_Core_Action::formLink(
+          self::links(),
+          $action,
+          array('id' => $dao->entity_id),
+          ts('more'),
+          FALSE,
+          'aclRole.manage.action',
+          'ACLRole',
+          $dao->entity_id
         );
       }
       elseif (CRM_Utils_Array::value($dao->object_table, $permissions)) {
index 367928eed550c489a6fd564bf15c6c448c6ce7aa..c3c5456e21e3566b78303184e3efb7fac8b70074 100644 (file)
@@ -181,8 +181,15 @@ class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic {
         $action -= CRM_Core_Action::DISABLE;
       }
 
-      $entityRoles[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $dao->id)
+      $entityRoles[$dao->id]['action'] = CRM_Core_Action::formLink(
+        self::links(),
+        $action,
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'entityRole.manage.action',
+        'EntityRole',
+        $dao->id
       );
     }
     $this->assign('rows', $entityRoles);
index 1cdc61c98cf3740a39e02595505b2d6024d82fb1..a63ec5f8f740ddef6444a2fb2b5ff3a4afbb2c41 100644 (file)
@@ -2512,7 +2512,12 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n
             'cid' => $params['contact_id'],
             'cxt' => $context,
             'caseid' => CRM_Utils_Array::value('case_id', $values),
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'activity.tab.row',
+          'Activity',
+          $values['activity_id']
         );
       }
     }
index 3e873b9a7dd6a5a8217b552797b18093e5101dee..c6293d2e4bf8c04f0e2ad79a00f956b9091d81a9 100644 (file)
@@ -422,7 +422,12 @@ class CRM_Activity_Selector_Activity extends CRM_Core_Selector_Base implements C
             'cid' => $this->_contactId,
             'cxt' => $this->_context,
             'caseid' => CRM_Utils_Array::value('case_id', $row),
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'activity.selector.action',
+          'Activity',
+          $row['activity_id']
         );
       }
 
index 004bdf747f84b1a9d11d78eebd42ca66dbb7c059..d0366eb13d61a5e865101d63b3404c01dde50f4d 100644 (file)
@@ -320,7 +320,12 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
           'id' => $result->activity_id,
           'cid' => $contactId,
           'cxt' => $this->_context,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'activity.selector.row',
+        'Activity',
+        $result->activity_id
       );
 
       //carry campaign to selector.
index 40bce4d5334b0e1f667a483a157f7d560d54a620..ab33813b5f2c2707fb8e432157d2c852cc608f56 100644 (file)
@@ -207,8 +207,12 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
     $this->assign('tokenUrl', $tokenUrl);
     $this->add('text', 'recipient_manual_id', ts('Manual Recipients'));
 
-    $this->addElement('select', 'group_id', ts('Group'),
-      CRM_Core_PseudoConstant::staticGroup()
+    $this->addElement(
+      'select',
+      'group_id',
+      ts('Group'),
+      // CRM-13577
+      CRM_Core_PseudoConstant::group()
     );
 
     CRM_Mailing_BAO_Mailing::commonCompose($this);
index 5ed8f35a9fff7513ad5470f4793514259aeaba09..3c191525f5eb8e6f6b7967f5672077f8069254ba 100644 (file)
@@ -127,7 +127,12 @@ class CRM_Admin_Page_ContactType extends CRM_Core_Page_Basic {
         }
       }
       $rows[$key]['action'] = CRM_Core_Action::formLink(self::links(), $mask,
-        array('id' => $value['id'])
+        array('id' => $value['id']),
+        ts('more'),
+        FALSE,
+        'contactType.manage.action',
+        'ContactType',
+        $value['id']
       );
     }
     $this->assign('rows', $rows);
index 806eb43fa174d632529da24090ffd3bd1d1a5f72..cc33e056cad11e2d77776836821a20c116b322b3 100644 (file)
@@ -125,7 +125,12 @@ class CRM_Admin_Page_EventTemplate extends CRM_Core_Page_Basic {
 
       //add action links.
       $allEventTemplates[$eventTemplate->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $eventTemplate->id)
+        array('id' => $eventTemplate->id),
+        ts('more'),
+        FALSE,
+        'eventTemplate.manage.action',
+        'Event',
+        $eventTemplate->id
       );
     }
     $this->assign('rows', $allEventTemplates);
index 09b51674429ef95ec48c6a6515422ccefdbe8505..519414d3323f1c2fc4bf3f472f6a6c1339197598 100644 (file)
@@ -197,8 +197,15 @@ class CRM_Admin_Page_Extensions extends CRM_Core_Page_Basic {
         array(
           'id' => $row['id'],
           'key' => $obj->key,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'extension.local.action',
+        'Extension',
+        $row['id']
       );
+      // Key would be better to send, but it's not an integer.  Moreover, sending the
+      // values to hook_civicrm_links means that you can still get at the key
 
       $localExtensionRows[$row['id']] = $row;
     }
@@ -215,7 +222,12 @@ class CRM_Admin_Page_Extensions extends CRM_Core_Page_Basic {
         array(
           'id' => $row['id'],
           'key' => $row['key'],
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'extension.remote.action',
+        'Extension',
+        $row['id']
       );
       $remoteExtensionRows[$row['id']] = $row;
     }
index 19fbda939ce0248a06a1bb7ce9af90ced6429825..2bc2e5c49615745ea6c2168b34ea6432abc96215 100644 (file)
@@ -177,7 +177,12 @@ class CRM_Admin_Page_Job extends CRM_Core_Page_Basic {
       }
 
       $job->action = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $job->id)
+        array('id' => $job->id),
+        ts('more'),
+        FALSE,
+        'job.manage.action',
+        'Job',
+        $job->id
       );
       $rows[] = get_object_vars($job);
     }
index 9959a66eb7a794b429512ac4d83383879d759746..8c25975a4678a0ebd6c60fec74bde253153894b0 100644 (file)
@@ -137,7 +137,13 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
 
       $format['groupName'] = ts('Mailing Label');
       $format['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $format['id'], 'group' => 'label_format'));
+        array('id' => $format['id'], 'group' => 'label_format'),
+        ts('more'),
+        FALSE,
+        'labelFormat.manage.action',
+        'LabelFormat',
+        $format['id']
+      );
     }
 
     // Add action links to each of the Label Formats
index 7578df60fa767394b3489ceef8ff25f2520d1756..37dcf2b549535d1027a43435e0d139ae44a38453 100644 (file)
@@ -116,7 +116,12 @@ class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic {
 
       //add action links.
       $allMailSettings[$mailSetting->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $mailSetting->id)
+        array('id' => $mailSetting->id),
+        ts('more'),
+        FALSE,
+        'mailSetting.manage.action',
+        'MailSetting',
+        $mailSetting->id
       );
     }
 
index 597d5d51a8f6a99e6061f62e578887a9923ccdba..a2a834b7fd89b753a9da2c81146c494e571beee6 100644 (file)
@@ -155,7 +155,13 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
       $values['action'] = CRM_Core_Action::formLink($links, $action, array(
         'id' => $object->id,
           'orig_id' => CRM_Utils_Array::value($object->id, $this->_revertible),
-        ));
+        ),
+        ts('more'),
+        FALSE,
+        'messageTemplate.manage.action',
+        'MessageTemplate',
+        $object->id
+      );
     }
     else {
       $action &= ~CRM_Core_Action::REVERT;
index fe5e2c3b036f93f6e8c2dad78828bc069cba4ec7..00d5371bc8fa385cab2b52b07518af5fd6c2b406 100644 (file)
@@ -205,7 +205,12 @@ class CRM_Admin_Page_OptionValue extends CRM_Core_Page_Basic {
       }
 
       $optionValue[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $dao->id, 'gid' => $this->_gid)
+        array('id' => $dao->id, 'gid' => $this->_gid),
+        ts('more'),
+        FALSE,
+        'optionValue.admin.actions',
+        'optionValue',
+        $dao->id
       );
     }
 
index 9c9b93e385b972e4a4b21c482ccbf96fe4083d23..c87e99e18b31ef24f095b0bffa398d3b5a22d961 100644 (file)
@@ -92,7 +92,16 @@ class CRM_Admin_Page_ParticipantStatus extends CRM_Core_Page_Basic {
         }
       }
       $action -= $dao->is_active ? CRM_Core_Action::ENABLE : CRM_Core_Action::DISABLE;
-      $statusTypes[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action, array('id' => $dao->id));
+      $statusTypes[$dao->id]['action'] = CRM_Core_Action::formLink(
+        self::links(),
+        $action,
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'participantStatusType.manage.action',
+        'ParticipantStatusType',
+        $dao->id
+      );
       $statusTypes[$dao->id]['visibility'] = $visibilities[$dao->visibility_id];
     }
     $this->assign('rows', $statusTypes);
index f7046a256e46a8153c0aa7106ac283bd5b6857f7..b5a4b5e837989707093030678812a7144303a720 100644 (file)
@@ -149,7 +149,12 @@ class CRM_Admin_Page_PaymentProcessor extends CRM_Core_Page_Basic {
       }
 
       $paymentProcessor[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $dao->id)
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'paymentProcessor.manage.action',
+        'PaymentProcessor',
+        $dao->id
       );
       $paymentProcessor[$dao->id]['financialAccount'] = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount($dao->id, 'civicrm_payment_processor');
     }
index 106bfa9c01de0702c6ebfc27850a45f76e13b336..88f4f4549bf23610e34a2febb48c6d96f341fae3 100644 (file)
@@ -124,7 +124,16 @@ class CRM_Admin_Page_PdfFormats extends CRM_Core_Page_Basic {
     // Add action links to each of the PDF Page Formats
     $action = array_sum(array_keys($this->links()));
     foreach ($pdfFormatList as & $format) {
-      $format['action'] = CRM_Core_Action::formLink(self::links(), $action, array('id' => $format['id']));
+      $format['action'] = CRM_Core_Action::formLink(
+        self::links(),
+        $action,
+        array('id' => $format['id']),
+        ts('more'),
+        FALSE,
+        'pdfFormat.manage.action',
+        'PdfFormat',
+        $format['id']
+      );
     }
 
     // Order Label Formats by weight
index dde001f0ca1300f5c77dc1f284d873a648c76511..5812ad2b598f48ce6ed10375522f5881a4e0136b 100644 (file)
@@ -119,7 +119,12 @@ class CRM_Admin_Page_Persistent extends CRM_Core_Page {
       if ($daoResult->is_config == 1) {
         $values[$daoResult->id]['action'] = CRM_Core_Action::formLink(self::customizeActionLinks(),
           NULL,
-          array('id' => $daoResult->id)
+          array('id' => $daoResult->id),
+          ts('more'),
+          FALSE,
+          'persistent.config.actions',
+          'Persistent',
+          $daoResult->id
         );
         $values[$daoResult->id]['data'] = implode(',', unserialize($daoResult->data));
         $configCustomization[$daoResult->id] = $values[$daoResult->id];
@@ -127,7 +132,12 @@ class CRM_Admin_Page_Persistent extends CRM_Core_Page {
       if ($daoResult->is_config == 0) {
         $values[$daoResult->id]['action'] = CRM_Core_Action::formLink(self::stringActionLinks(),
           NULL,
-          array('id' => $daoResult->id)
+          array('id' => $daoResult->id),
+          ts('more'),
+          FALSE,
+          'persistent.row.actions',
+          'Persistent',
+          $daoResult->id
         );
         $configStrings[$daoResult->id] = $values[$daoResult->id];
       }
index 4f3bd7dedf532d8016f97129fd946f59bc844f30..6c684af78d03721e304399b02c0a914a0cffef90 100644 (file)
@@ -143,7 +143,16 @@ class CRM_Admin_Page_ScheduleReminders extends CRM_Core_Page_Basic {
         else {
           $action -= CRM_Core_Action::DISABLE;
         }
-        $format['action'] = CRM_Core_Action::formLink(self::links(), $action, array('id' => $format['id']));
+        $format['action'] = CRM_Core_Action::formLink(
+          self::links(),
+          $action,
+          array('id' => $format['id']),
+          ts('more'),
+          FALSE,
+          'actionSchedule.manage.action',
+          'ActionSchedule',
+          $format['id']
+        );
       }
     }
 
index c7ea9fd99fbc6ce61d3ed8bff25932dbeb986f4c..88273926d8939cfc7cc79a827272a526a19b3d7a 100644 (file)
@@ -326,7 +326,12 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
       $values['action'] = CRM_Core_Action::formLink(
         $newLinks,
         $action,
-        $tokens
+        $tokens),
+        ts('more'),
+        FALSE,
+        'batch.selector.row',
+        'Batch',
+        $object->id
       );
       $results[$object->id] = $values;
     }
index 43bf4aedaae5410f465cb8dc8bc032ecbe5ba67f..3523409c36eb7e7cec64376cb15904eb969eb19b 100644 (file)
@@ -110,7 +110,12 @@ class CRM_Campaign_Page_Campaign extends CRM_Core_Page {
           $action -= CRM_Core_Action::DISABLE;
         }
         $campaigns[$cmpid]['action'] = CRM_Core_Action::formLink(self::actionLinks(), $action,
-          array('id' => $campaign['id'])
+          array('id' => $campaign['id']),
+          ts('more'),
+          FALSE,
+          'campaign.selector.row',
+          'Campaign',
+          $campaign['id']
         );
       }
     }
index afe6963c19c117322c114631848fb02157004921..7fceadf1df34298a690be847f181b871e2d1038e 100644 (file)
@@ -241,7 +241,12 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
         }
         $campaignsData[$cmpid]['action'] = CRM_Core_Action::formLink(self::campaignActionLinks(),
           $action,
-          array('id' => $campaign['id'])
+          array('id' => $campaign['id']),
+          ts('more'),
+          FALSE,
+          'campaign.dashboard.row',
+          'Campaign',
+          $campaign['id']
         );
       }
     }
@@ -321,7 +326,12 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
         }
         $surveysData[$sid]['action'] = CRM_Core_Action::formLink(self::surveyActionLinks($surveysData[$sid]['activity_type']),
           $action,
-          array('id' => $sid)
+          array('id' => $sid),
+          ts('more'),
+          FALSE,
+          'survey.dashboard.row',
+          'Survey',
+          $sid
         );
 
         if (CRM_Utils_Array::value('activity_type', $surveysData[$sid]) != 'Petition') {
@@ -402,7 +412,12 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
 
         $petitionsData[$pid]['action'] = CRM_Core_Action::formLink(self::petitionActionLinks(),
           $action,
-          array('id' => $pid)
+          array('id' => $pid),
+          ts('more'),
+          FALSE,
+          'petition.dashboard.row',
+          'Petition',
+          $pid
         );
       }
     }
index 018fa95874d87df3b0e813a7b0cc8f1215202a56..0d0448f0b21872c1f3a9d1179b32ce9349199c77 100644 (file)
@@ -96,7 +96,16 @@ class CRM_Campaign_Page_Survey extends CRM_Core_Page {
           $action -= CRM_Core_Action::DISABLE;
         }
 
-        $surveys[$sid]['action'] = CRM_Core_Action::formLink($this->actionLinks(), $action, array('id' => $sid));
+        $surveys[$sid]['action'] = CRM_Core_Action::formLink(
+          $this->actionLinks(),
+          $action,
+          array('id' => $sid),
+          ts('more'),
+          FALSE,
+          'survey.selector.row',
+          'Survey',
+          $sid
+        );
       }
     }
 
index a80e7c74be2b815a52115717f411ad0d33e7016b..01f5a706fbc70e961c4138d2570ba918b888be76 100644 (file)
@@ -780,7 +780,12 @@ AND civicrm_case.status_id != $closedId";
               'id' => $result->case_id,
               'cid' => $result->contact_id,
               'cxt' => $context,
-            )
+            ),
+            ts('more'),
+            FALSE,
+            'case.actions.primary',
+            'Case',
+            $result->case_id
           );
           $casesList[$result->case_id]['moreActions'] = CRM_Core_Action::formLink($actions['moreActions'],
             $mask,
@@ -790,7 +795,10 @@ AND civicrm_case.status_id != $closedId";
               'cxt' => $context,
             ),
             ts('more'),
-            TRUE
+            TRUE,
+            'case.actions.more',
+            'Case',
+            $result->case_id
           );
         }
         elseif ($field == 'case_status') {
index 613e9b3ed6d3e4b4bc21ca6d0c9ab214178e5f93..71af2aad9fa67d82a15bb56518d94ff79b818989 100644 (file)
@@ -342,7 +342,12 @@ class CRM_Case_Selector_Search extends CRM_Core_Selector_Base {
           'id' => $result->case_id,
           'cid' => $result->contact_id,
           'cxt' => $this->_context,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'case.selector.actions',
+        'Case',
+        $result->case_id
       );
       $row['moreActions'] = CRM_Core_Action::formLink(CRM_Utils_Array::value('moreActions', $links),
         $mask, array(
@@ -351,7 +356,10 @@ class CRM_Case_Selector_Search extends CRM_Core_Selector_Base {
           'cxt' => $this->_context,
         ),
         ts('more'),
-        TRUE
+        TRUE,
+        'case.selector.moreActions',
+        'Case',
+        $result->case_id
       );
 
       $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?
index fb680b7b87138cf69613b799f0c966c80d8f48d1..83f7d21e40df0f752ad3174b9cedab241f0a15a1 100644 (file)
@@ -859,7 +859,12 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
           array(
             'id' => $object->id,
             'ssid' => $object->saved_search_id,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'group.selector.row',
+          'Group',
+          $object->id
         );
 
         // If group has children, add class for link to view children
index 23472e6b26040f5e6cc350fb2a5ff135191999d0..69354b935ab17af857584ea98009aed8860d85a4 100644 (file)
@@ -1084,7 +1084,15 @@ LEFT JOIN  civicrm_country ON (civicrm_address.country_id = civicrm_country.id)
             }
           }
 
-          $values[$rid]['action'] = CRM_Core_Action::formLink($links, $mask, $replace);
+          $values[$rid]['action'] = CRM_Core_Action::formLink(
+            $links, 
+            $mask, 
+            $replace,
+            ts('more'),
+            FALSE,
+            'relationship.selector.row',
+            'Relationship',
+            $rid);
           unset($links[CRM_Core_Action::MAX_ACTION]);
         }
       }
index 6cea50882c87a1b81da83515791598518a8c36de..cbabfb8782b7882e72f5c350df3ba43a2db291b7 100644 (file)
@@ -762,7 +762,12 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
         CRM_Core_Action::DELETE,
         array(
           'id' => $this->_contactId,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'contact.image.delete',
+        'Contact',
+        $this->_contactId
       );
       $this->assign('deleteURL', $deleteURL);
     }
index b800998f682a4825580c70c025fb98aab650c959..4ea6369a924f33ba1f2cdd6390c24e3df48ef9c2 100644 (file)
@@ -164,7 +164,16 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic {
         unset($links[CRM_Core_Action::DELETE]);
       }
 
-      $ruleGroups[$dao->contact_type][$dao->id]['action'] = CRM_Core_Action::formLink($links, $action, array('id' => $dao->id));
+      $ruleGroups[$dao->contact_type][$dao->id]['action'] = CRM_Core_Action::formLink(
+        $links,
+        $action,
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'dedupeRule.manage.action',
+        'DedupeRule',
+        $dao->id
+      );
       CRM_Dedupe_DAO_RuleGroup::addDisplayEnums($ruleGroups[$dao->contact_type][$dao->id]);
     }
 
index 4db90d18f0acfe181da09ab7bf766ea9345d8255..68cc9f1775b91ace900824b96a41bcbb687f448c 100644 (file)
@@ -104,7 +104,16 @@ class CRM_Contact_Page_SavedSearch extends CRM_Core_Page {
 
           $action        = array_sum(array_keys(self::links()));
           $action        = $action & CRM_Core_Action::mask($permissions);
-          $row['action'] = CRM_Core_Action::formLink(self::links(), $action, array('id' => $row['id']));
+          $row['action'] = CRM_Core_Action::formLink(
+            self::links(),
+            $action,
+            array('id' => $row['id']),
+            ts('more'),
+            FALSE,
+            'savedSearch.manage.action',
+            'SavedSearch',
+            $row['id']
+          );
 
           $rows[] = $row;
         }
index fa59fc7f9d4f53bb22459d221b59f65f1dd06f14..e6d54f7df0fd480df5e3c5c635114749a234cf07 100644 (file)
@@ -118,7 +118,12 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
           array(
             'id' => $note->id,
             'cid' => $this->_contactId,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'note.selector.row',
+          'Note',
+          $note->id
         );
         $contact = new CRM_Contact_DAO_Contact();
         $contact->id = $note->contact_id;
@@ -141,7 +146,12 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
         'id' => $note->id,
         'pid' => $note->entity_id,
         'cid' => $note->entity_id,
-      )
+      ),
+      ts('more'),
+      FALSE,
+      'note.comment.action',
+      'Note',
+      $note->id
     );
     $this->assign('commentAction', $commentAction);
   }
index 4d465137a19de9742e491bd740b3f01165516f85..f3523ffe92f274c56801d5e2fee429ec09efd18f 100644 (file)
@@ -731,7 +731,16 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
               'title' => ts('Permanently Delete Contact'),
             );
           }
-          $row['action'] = CRM_Core_Action::formLink($links, NULL, array('id' => $result->contact_id));
+          $row['action'] = CRM_Core_Action::formLink(
+            $links,
+            NULL,
+            array('id' => $result->contact_id),
+            ts('more'),
+            FALSE,
+            'contact.selector.row',
+            'Contact',
+            $result->contact_id
+          );
         }
         elseif ((is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) ||
           ($config->mapGeoCoding &&
@@ -739,10 +748,28 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
             CRM_Utils_Array::value('state_province', $row)
           )
         ) {
-          $row['action'] = CRM_Core_Action::formLink($links, $mask, array('id' => $result->contact_id));
+          $row['action'] = CRM_Core_Action::formLink(
+            $links,
+            $mask,
+            array('id' => $result->contact_id),
+            ts('more'),
+            FALSE,
+            'contact.selector.row',
+            'Contact',
+            $result->contact_id
+          );
         }
         else {
-          $row['action'] = CRM_Core_Action::formLink($links, $mapMask, array('id' => $result->contact_id));
+          $row['action'] = CRM_Core_Action::formLink(
+            $links,
+            $mapMask,
+            array('id' => $result->contact_id),
+            ts('more'),
+            FALSE,
+            'contact.selector.row',
+            'Contact',
+            $result->contact_id
+          );
         }
 
         // allow components to add more actions
@@ -848,7 +875,16 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
             'title' => ts('Permanently Delete Contact'),
           );
         }
-        $row['action'] = CRM_Core_Action::formLink($links, NULL, array('id' => $row['contact_id']));
+        $row['action'] = CRM_Core_Action::formLink(
+          $links,
+          null,
+          array('id' => $row['contact_id']),
+          ts('more'),
+          FALSE,
+          'contact.selector.actions',
+          'Contact',
+          $row['contact_id']
+        );
       }
       elseif ((is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) ||
         ($config->mapGeoCoding &&
@@ -856,10 +892,28 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
           CRM_Utils_Array::value('state_province', $row)
         )
       ) {
-        $row['action'] = CRM_Core_Action::formLink($links, $mask, array('id' => $row['contact_id']));
+        $row['action'] = CRM_Core_Action::formLink(
+          $links,
+          $mask,
+          array('id' => $row['contact_id']),
+          ts('more'),
+          FALSE,
+          'contact.selector.actions',
+          'Contact',
+          $row['contact_id']
+        );
       }
       else {
-        $row['action'] = CRM_Core_Action::formLink($links, $mapMask, array('id' => $row['contact_id']));
+        $row['action'] = CRM_Core_Action::formLink(
+          $links,
+          $mapMask,
+          array('id' => $row['contact_id']),
+          ts('more'),
+          FALSE,
+          'contact.selector.actions',
+          'Contact',
+          $row['contact_id']
+        );
       }
 
       // allow components to add more actions
index df509f02df5447ef6a2649d43b1e2afb10d76251..d682d8aa45c41a3a78c3e825ce2e1206f634b314 100644 (file)
@@ -332,7 +332,12 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
         $row['checkbox'] = CRM_Core_Form::CB_PREFIX . $contactID;
         $row['action'] = CRM_Core_Action::formLink($links,
           $mask,
-          array('id' => $contactID)
+          array('id' => $contactID),
+          ts('more'),
+          FALSE,
+          'contact.custom.actions',
+          'Contact',
+          $contactID
         );
         $row['contact_id'] = $contactID;
 
@@ -406,7 +411,12 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector {
     foreach ($rows as $id => & $row) {
       $row['action'] = CRM_Core_Action::formLink($links,
         $mask,
-        array('id' => $row['contact_id'])
+        array('id' => $row['contact_id']),
+        ts('more'),
+        FALSE,
+        'contact.custom.actions',
+        'Contact',
+        $row['contact_id']
       );
     }
   }
index e1787a7fc2b19682672e01be9d3949696fa20a40..8c97a372256226579d0fbc84aa0839a9d8a9b8bb 100644 (file)
@@ -487,7 +487,10 @@ ORDER BY title asc
         $action,
         array('id' => $dao->id),
         ts('Configure'),
-        TRUE
+        TRUE,
+        'contributionpage.configure.actions',
+        'ContributionPage',
+        $dao->id
       );
 
       //build the contributions links.
@@ -495,7 +498,10 @@ ORDER BY title asc
         $action,
         array('id' => $dao->id),
         ts('Contributions'),
-        TRUE
+        TRUE,
+        'contributionpage.contributions.search',
+        'ContributionPage',
+        $dao->id
       );
 
       //build the online contribution links.
@@ -503,7 +509,10 @@ ORDER BY title asc
         $action,
         array('id' => $dao->id),
         ts('Links'),
-        TRUE
+        TRUE,
+        'contributionpage.online.links',
+        'ContributionPage',
+        $dao->id
       );
 
       //build the normal action links.
@@ -511,7 +520,10 @@ ORDER BY title asc
         $action,
         array('id' => $dao->id),
         ts('more'),
-        TRUE
+        TRUE,
+        'contributionpage.action.links',
+        'ContributionPage',
+        $dao->id
       );
 
       //show campaigns on selector.
index 749f8d3f1dac86eb9950c16f301951b19adf4f07..3ee39d0d45f179d46c19140ff20f4e8c240e7c71 100644 (file)
@@ -165,7 +165,12 @@ class CRM_Contribute_Page_ManagePremiums extends CRM_Core_Page_Basic {
 
       $premiums[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(),
         $action,
-        array('id' => $dao->id)
+        array('id' => $dao->id)),
+        ts('more'),
+        FALSE,
+        'premium.manage.row',
+        'Premium',
+        $dao->id
       );
            //Financial Type
                 if( !empty( $dao->financial_type_id )  ){
index 031b02431a620d26cc2b3e0c2e77d9540c3a6603..6e7c425510d64994e7b0427098440a5f85d3f898 100644 (file)
@@ -167,7 +167,12 @@ class CRM_Contribute_Page_Premium extends CRM_Core_Page_Basic {
         $action = array_sum(array_keys($this->links()));
 
         $premiums[$dao->product_id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-          array('id' => $pageID, 'pid' => $dao->id)
+          array('id' => $pageID, 'pid' => $dao->id),
+          ts('more'),
+          FALSE,
+          'premium.contributionpage.row',
+          'Premium',
+          $dao->id
         );
         //Financial Type
         if (!empty($dao->financial_type_id)) {
index 9ccdb57df3746d0cdb33556555a4edb3b66cf1ef..d80848fcded6dd5f191f2ebf90ae5fe7680053f9 100644 (file)
@@ -193,7 +193,12 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
               'cid' => $this->_contactId,
               'crid' => $ids,
               'cxt' => 'contribution',
-            )
+            ),
+            ts('more'),
+            FALSE,
+            'contribution.selector.recurring',
+            'Contribution',
+            $ids
           );
         }
       }
@@ -220,7 +225,12 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
             'cxt' => 'contribution',
             'contributionType' => $honorId['type_id'],
             'honorId' => $this->_contactId,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'contribution.selector.honoree',
+          'Contribution',
+          $ids
         );
       }
 
index eca35b2cd2056158526b5535e506dea1148aac33..6b4a05ac50c413c7126a9372a4259f409fe22e2f 100644 (file)
@@ -111,7 +111,12 @@ class CRM_Contribute_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBo
           'cid' => $this->_contactId,
           'crid' => $values['id'],
           'cxt' => 'contribution',
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'contribution.dashboard.recurring',
+        'Contribution',
+        $values['id']
       );
 
       $recurIDs[] = $values['id'];
index fb1a4157affd6927d65b37963396f188b886b32e..fefbbc78b8463c3e3346108137f4f32c827ee4ba 100644 (file)
@@ -379,7 +379,12 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C
           $qfKey,
           $componentContext
         ),
-        $mask, $actions
+        $mask, $actions,
+        ts('more'),
+        FALSE,
+        'contribution.selector.row',
+        'Contribution',
+        $result->contribution_id
       );
 
       $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?
index 1922e6656d7051edd90cef0ee5e5eb6fb230a3f2..03e601944cd4ae3b3b67a5365bcc4c19cc2a8225 100644 (file)
@@ -748,7 +748,12 @@ ORDER BY civicrm_custom_group.weight,
               'id' => $fileDAO->id,
               'eid' => $dao->$entityIDName,
               'fid' => $fieldID,
-            )
+            ),
+            ts('more'),
+            FALSE,
+            'file.manage.delete',
+            'File',
+            $fileDAO->id
           );
           $customValue['deleteURLArgs'] = CRM_Core_BAO_File::deleteURLArgs($table, $dao->$entityIDName, $fileDAO->id);
           $customValue['fileName'] = CRM_Utils_File::cleanFileName(basename($fileDAO->uri));
index b449f454e04b61dff2e1e55b7d4644e199d9a7c5..3b9c22b2a9ec663f3a2d208830cc2f15469ce65f 100644 (file)
@@ -1759,7 +1759,12 @@ AND    ( entity_id IS NULL OR entity_id <= 0 )
         CRM_Core_Action::DELETE,
         array('id' => $form->get('id'),
           'gid' => $form->get('gid'),
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'contact.profileimage.delete',
+        'Contact',
+        $form->get('id')
       );
       $form->assign('deleteURL', $deleteURL);
     }
index a523f4faf59bf8f1c0c82047c8902d9974dd973c..a7092655b61e39ad5a8a553ccfa33e096536dd23 100644 (file)
@@ -146,7 +146,12 @@ class CRM_Core_OptionValue {
           'id' => $dao->id,
           'gid' => $optionGroupID,
           'value' => $dao->value,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'optionValue.row.actions',
+        'optionValue',
+        $dao->id
       );
 
       if (CRM_Utils_Array::value('component_id', $optionValue[$dao->id])) {
index cf31c5aed0e2b39e444d6df643f33807bb5a195e..8475b42d0181b05b7afe682bbbedac22a720a446 100644 (file)
@@ -177,7 +177,12 @@ class CRM_Custom_Page_Field extends CRM_Core_Page {
         array(
           'id' => $customFieldBAO->id,
           'gid' => $this->_gid,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'customField.row.actions',
+        'CustomField',
+        $customFieldBAO->id
       );
     }
 
index eb44673434416e144b0e30fba65c36411c0453e7..5f0984f98f6b332145b37c24bef2bb95310d170f 100644 (file)
@@ -227,7 +227,12 @@ class CRM_Custom_Page_Group extends CRM_Core_Page {
       }
       $customGroup[$dao->id]['order'] = $customGroup[$dao->id]['weight'];
       $customGroup[$dao->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(), $action,
-        array('id' => $dao->id)
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'customGroup.row.actions',
+        'CustomGroup',
+        $dao->id
       );
     }
 
index 0bca63dd694a2eb3e4b17e013ac93e3c0ef4b43a..95c2a655859712574ae3e356b28a7f8e03d63aba 100644 (file)
@@ -217,7 +217,12 @@ ORDER BY weight, label
           'id' => $dao->id,
           'fid' => $this->_fid,
           'gid' => $this->_gid,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'customOption.row.actions',
+        'customOption',
+        $dao->id
       );
     }
 
index 53b7491958d1d38c5f2d08886a2c1673be38b9a8..b5b324dd2b46fc8e6948c13655ed4832a79ebd32 100755 (executable)
@@ -74,7 +74,12 @@ class CRM_Event_Form_ManageEvent_ScheduleReminders extends CRM_Event_Form_Manage
           $format['action'] = CRM_Core_Action::formLink(
             $links,
             $action,
-            array('id' => $format['id'])
+            array('id' => $format['id'])),
+            ts('more'),
+            FALSE,
+            'event.reminder.list',
+            'Event',
+            $this->_id
           );
         }
         $this->assign('rows', $reminderList);
index 33fd345852071dace840043e9cd5b9282f14e0cc..0a7e0b9dd64df45f38ff0df27f5e43eb1d2b1867 100644 (file)
@@ -323,7 +323,10 @@ ORDER BY start_date desc
           $action,
           array('id' => $dao->id),
           ts('more'),
-          TRUE
+          TRUE,
+          'event.manage.list',
+          'Event',
+          $dao->id
         );
 
         $params = array(
index 4055b261a314dc1a020fd0aef12c9656b95aa23b..4961d18e1b4a3acd9f59644cefa5ec8ac3e62207 100644 (file)
@@ -367,7 +367,12 @@ class CRM_Event_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co
           'id' => $result->participant_id,
           'cid' => $result->contact_id,
           'cxt' => $this->_context,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'participant.selector.row',
+        'Participant',
+        $result->participant_id
       );
 
 
index 73b0f0e40936c7b1caed7719b76b7b4da249e035..fa617503f518ecc7ab351a5481697986ffead0af 100644 (file)
@@ -377,19 +377,58 @@ class CRM_Financial_Page_AJAX {
         if (isset($notPresent)) {
           $js = "enableActions('x')";
           $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_x_". $financialItem->id."' name='mark_x_". $financialItem->id."' value='1' onclick={$js}></input>";
-          $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(CRM_Financial_Form_BatchTransaction::links(), null, array('id' => $financialItem->id, 'contid' => $financialItem->contributionID, 'cid' => $financialItem->contact_id));
+          $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(
+            CRM_Financial_Form_BatchTransaction::links(),
+            null,
+            array(
+              'id' => $financialItem->id,
+              'contid' => $financialItem->contributionID,
+              'cid' => $financialItem->contact_id
+            ),
+            ts('more'),
+            FALSE,
+            'financialItem.batch.row',
+            'FinancialItem',
+            $financialItem->id
+          );
         }
         else {
           $js = "enableActions('y')";
           $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_y_". $financialItem->id."' name='mark_y_". $financialItem->id."' value='1' onclick={$js}></input>";
-          $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(CRM_Financial_Page_BatchTransaction::links(), null, array('id' => $financialItem->id, 'contid' => $financialItem->contributionID, 'cid' => $financialItem->contact_id));
+          $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(
+            CRM_Financial_Page_BatchTransaction::links(),
+            null,
+            array(
+              'id' => $financialItem->id,
+              'contid' => $financialItem->contributionID,
+              'cid' => $financialItem->contact_id
+            ),
+            ts('more'),
+            FALSE,
+            'financialItem.batch.row',
+            'FinancialItem',
+            $financialItem->id
+          );
         }
       }
       else {
         $row[$financialItem->id]['check'] = NULL;
         $links = CRM_Financial_Page_BatchTransaction::links();
         unset($links['remove']);
-        $row[$financialItem->id]['action'] = CRM_Core_Action::formLink($links, null, array('id' => $financialItem->id, 'contid' => $financialItem->contributionID, 'cid' => $financialItem->contact_id));
+        $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(
+          $links,
+          null,
+          array(
+            'id' => $financialItem->id,
+            'contid' => $financialItem->contributionID,
+            'cid' => $financialItem->contact_id
+          ),
+          ts('more'),
+          FALSE,
+          'financialItem.batch.row',
+          'FinancialItem',
+          $financialItem->id
+        );
       }
       $row[$financialItem->id]['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage(CRM_Utils_Array::value('contact_sub_type',$row[$financialItem->id]) ? CRM_Utils_Array::value('contact_sub_type',$row[$financialItem->id]) : CRM_Utils_Array::value('contact_type',$row[$financialItem->id]) ,false, $financialItem->contact_id);
       $financialitems = $row;
index d9cabd0220d0d217af1b35d47b766cd971e1d500..7da3b0226702df1d5dad93bb5d0eb14171c483c7 100644 (file)
@@ -156,7 +156,13 @@ class CRM_Financial_Page_FinancialAccount extends CRM_Core_Page_Basic {
       }
 
       $contributionType[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $dao->id));
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'financialAccount.manage.action',
+        'FinancialAccount',
+        $dao->id
+      );
     }
     $this->assign('rows', $contributionType);
   }
index 6e1f633f87b42634ae9dbe2504844ec04242fcb9..3559b4d90c7d6dea4379e53997c1c15b9ae23fc5 100644 (file)
@@ -182,7 +182,13 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic {
       }
 
       $financialType[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $dao->id));
+        array('id' => $dao->id),
+        ts('more'),
+        FALSE,
+        'financialType.manage.action',
+        'FinancialType',
+        $dao->id
+      );
     }
     $this->assign('rows', $financialType);
   }
index 02296b404332c2792083689416efd24999837b29..346d783628789ced730fcf349877b5c7b26d6cab 100644 (file)
@@ -178,7 +178,12 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
           array(
             'id' => $dao->id,
             'aid'=> $dao->entity_id,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'financialTypeAccount.manage.action',
+          'FinancialTypeAccount',
+          $dao->id
         );
       }
       $this->assign('rows', $financialType);
index 70aa1c029d1499ce3752e77f7be9f71adffa1d96..d4dea93d6bdae174c221f25fb6e72d9784c05cf5 100644 (file)
@@ -312,7 +312,12 @@ class CRM_Grant_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co
           'id' => $result->grant_id,
           'cid' => $result->contact_id,
           'cxt' => $this->_context,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'grant.selector.row',
+        'Grant',
+        $result->grant_id
       );
 
       $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?
index ea6b78808478887bf85b0e28dcd82056101877b3..1a8bc0cd262f40b6c4871e1e1f331eb72863c606 100644 (file)
@@ -2030,7 +2030,7 @@ ORDER BY   civicrm_email.is_bulkmail DESC
       ) as $key) {
       $url          = 'mailing/detail';
       $reportFilter = "reset=1&mailing_id_value={$mailing_id}";
-      $searchFilter = "force=1&mailing_id={$mailing_id}";
+      $searchFilter = "force=1&mailing_id=%%mid%%";
       switch ($key) {
         case 'delivered':
           $reportFilter .= "&delivery_status_value=successful";
@@ -2077,7 +2077,16 @@ ORDER BY   civicrm_email.is_bulkmail DESC
       if (array_key_exists(CRM_Core_Action::ADVANCED, $actionLinks)) {
         $actionLinks[CRM_Core_Action::ADVANCED]['qs'] = $searchFilter;
       }
-      $report['event_totals']['actionlinks'][$key] = CRM_Core_Action::formLink($actionLinks, $action, array());
+      $report['event_totals']['actionlinks'][$key] = CRM_Core_Action::formLink(
+        $actionLinks,
+        $action,
+        array('mid' => $mailing_id),
+        ts('more'),
+        FALSE,
+        'mailing.report.action',
+        'Mailing',
+        $mailing_id
+      );
     }
 
     return $report;
@@ -2794,19 +2803,31 @@ AND        m.id = %1
         CRM_Core_Action::VIEW => array(
           'name' => ts('View'),
           'url' => 'civicrm/mailing/view',
-          'qs' => "reset=1&id={$values['mailing_id']}",
+          'qs' => "reset=1&id=%%mid%%",
           'title' => ts('View Mailing'),
           'class' => 'crm-mailing-view',
         ),
         CRM_Core_Action::BROWSE => array(
           'name' => ts('Mailing Report'),
           'url' => 'civicrm/mailing/report',
-          'qs' => "mid={$values['mailing_id']}&reset=1&cid={$params['contact_id']}&context=mailing",
+          'qs' => "mid=%%mid%%&reset=1&cid=%%cid%%&context=mailing",
           'title' => ts('View Mailing Report'),
         )
       );
 
-      $contactMailings[$mailingId]['links'] = CRM_Core_Action::formLink($actionLinks);
+      $contactMailings[$mailingId]['links'] = CRM_Core_Action::formLink(
+        $actionLinks,
+        null,
+        array(
+          'mid' => $values['mailing_id'],
+          'cid' => $params['contact_id'],
+        ),
+        ts('more'),
+        FALSE,
+        'mailing.contact.action',
+        'Mailing',
+        $values['mailing_id']
+      );
     }
 
     return $contactMailings;
index 7a6c9de10fd4b5edd2433dce90b33d78d4bfaa81..e6c4f1e47d34662a31b0e9a97c18045cd3e3a001 100644 (file)
@@ -308,7 +308,13 @@ class CRM_Mailing_Selector_Search extends CRM_Core_Selector_Base implements CRM_
 
       $row['action'] = CRM_Core_Action::formLink(
         self::links($qfKey, $this->_context),
-        $mask, $actions
+        $mask, 
+        $actions,
+        ts('more'),
+        FALSE,
+        'contact.mailing.row',
+        'Contact',
+        $result->contact_id
       );
       $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?
         $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id
index c3c9dd11bf0b22b4e48981b0f1fbf2598d264a21..776803e3bac990f05b92aa670e22219c7a840d6e 100644 (file)
@@ -286,7 +286,12 @@ SELECT r.id, c.id as cid, c.display_name as name, c.job_title as comment,
                 'id' => CRM_Utils_Request::retrieve('id', 'Positive', $this),
                 'cid' => $row['cid'],
                 'mid' => $row['mid'],
-              )
+              ),
+              ts('more'),
+              FALSE,
+              'membership.relationship.action',
+              'Relationship',
+              CRM_Utils_Request::retrieve('id', 'Positive', $this)
             );
           }
           else {
@@ -296,7 +301,12 @@ SELECT r.id, c.id as cid, c.display_name as name, c.job_title as comment,
                   'id' => CRM_Utils_Request::retrieve('id', 'Positive', $this),
                   'cid' => $row['cid'],
                   'rid' => $row['cid'],
-                )
+                ),
+                ts('more'),
+                FALSE,
+                'membership.relationship.action',
+                'Relationship',
+                CRM_Utils_Request::retrieve('id', 'Positive', $this)
               );
             }
           }
index cbcb906536c36e5c7d91c910de784ca288d98ba8..cb803473561ff6d55e7ebaae63f966d5e17870e4 100644 (file)
@@ -158,7 +158,12 @@ class CRM_Member_Page_MembershipStatus extends CRM_Core_Page_Basic {
           $action -= CRM_Core_Action::DISABLE;
         }
         $membershipStatus[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-          array('id' => $dao->id)
+          array('id' => $dao->id),
+          ts('more'),
+          FALSE,
+          'membershipStatus.manage.action',
+          'MembershipStatus',
+          $dao->id
         );
       }
       if ($startEvent = CRM_Utils_Array::value('start_event', $membershipStatus[$dao->id])) {
index ef0767cfaa45a26705c247c2fd77bb4443c4770d..8b530cf97c103528680faf41d7553b36f5c4cbab 100644 (file)
@@ -152,7 +152,12 @@ class CRM_Member_Page_MembershipType extends CRM_Core_Page {
         }
         $membershipType[$dao->id]['order'] = $membershipType[$dao->id]['weight'];
         $membershipType[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-          array('id' => $dao->id)
+          array('id' => $dao->id),
+          ts('more'),
+          FALSE,
+          'membershipType.manage.action',
+          'MembershipType',
+          $dao->id
         );
       }
     }
index 1e5f56fe0ac3b025cb7a6faa31f0603d67814560..d62568a4ac5177ac5be9c76a43ac3b7e51d3e645 100644 (file)
@@ -122,7 +122,12 @@ class CRM_Member_Page_Tab extends CRM_Core_Page {
           array(
             'id' => $dao->id,
             'cid' => $this->_contactId,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'membership.tab.row',
+          'Membership',
+          $dao->id
         );
       }
       else {
@@ -131,7 +136,12 @@ class CRM_Member_Page_Tab extends CRM_Core_Page {
           array(
             'id' => $dao->id,
             'cid' => $this->_contactId,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'membership.tab.row',
+          'Membership',
+          $dao->id
         );
       }
 
@@ -177,7 +187,12 @@ class CRM_Member_Page_Tab extends CRM_Core_Page {
         array(
           'id' => $value['id'],
           'cid' => $this->_contactId,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'membershipType.organization.action',
+        'MembershipType',
+        $value['id']
       );
     }
 
index d8674968b01236f4d939b253db081d3a29453782..e0924de73248964aabee2e9d6c531f10f8524f47 100644 (file)
@@ -397,7 +397,12 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C
             'id' => $result->membership_id,
             'cid' => $result->contact_id,
             'cxt' => $this->_context,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'membership.selector.row',
+          'Membership',
+          $result->membership_id
         );
       }
       else {
@@ -406,7 +411,12 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C
             'id' => $result->membership_id,
             'cid' => $result->contact_id,
             'cxt' => $this->_context,
-          )
+          ),
+          ts('more'),
+          FALSE,
+          'membership.selector.row',
+          'Membership',
+          $result->membership_id
         );
       }
 
index b9a58cc7c5e24ad74182b2bc94bf92476edddd40..5ba0323ecf83cf5b4f5e4c9a204de7dd4dc36519 100644 (file)
@@ -159,7 +159,8 @@ ORDER BY page_type, page_id";
       else {
         $mask -= CRM_Core_Action::DISABLE;
       }
-      $action = CRM_Core_Action::formLink($pcpLink, $mask, $replace);
+      $action = CRM_Core_Action::formLink($pcpLink, $mask, $replace, ts('more'),
+        FALSE, 'pcp.dashboard.active', 'PCP', $pcpInfoDao->id);
       $component = $pcpInfoDao->page_type;
       $pageTitle = CRM_Utils_Array::value($pcpInfoDao->page_id, $$component);
 
@@ -206,7 +207,8 @@ ORDER BY target_entity_type, target_entity_id
         );
       }
       $pcpLink = $links['add'];
-      $action = CRM_Core_Action::formLink($pcpLink, $mask, $replace);
+      $action = CRM_Core_Action::formLink($pcpLink, $mask, $replace, ts('more'),
+        FALSE, 'pcp.dashboard.other', "{$pcpBlockDao->target_entity_type}_PCP", $pcpBlockDao->target_entity_id);
       $component = $pcpBlockDao->target_entity_type;
       $pageTitle = CRM_Utils_Array::value($pcpBlockDao->target_entity_id, $$component);
       $pcpBlock[] = array(
index 170aed34e852ad3ca855def05dbf30d703c1f7f5..841efad02c428f76a7a5685f0f4a75c518d99e53 100644 (file)
@@ -320,7 +320,7 @@ class CRM_PCP_Page_PCP extends CRM_Core_Page_Basic {
         'page_url' => $pageUrl,
         'page_type' => $page_type,
         'action' => CRM_Core_Action::formLink(self::links(), $action,
-          array('id' => $pcp->id)
+          array('id' => $pcp->id), ts('more'), FALSE, 'contributionpage.pcp.list', 'PCP', $pcp->id
         ),
         'title' => $pcp->title,
         'class' => $class,
index 17bff4425102d719c85b7a323cb4810429ff3e5b..fb8c50201c32caa9070318b5e16505ac8600f091 100644 (file)
@@ -348,7 +348,12 @@ class CRM_Pledge_Selector_Search extends CRM_Core_Selector_Base {
           'id' => $result->pledge_id,
           'cid' => $result->contact_id,
           'cxt' => $this->_context,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'pledge.selector.row',
+        'Pledge',
+        $result->pledge_id
       );
 
 
index 9c0f6aa4f54f34b06cc9130b971878d2ae54b59e..46494f77a6fbb5fb5baf11224621f0cf144d0d57 100644 (file)
@@ -172,11 +172,18 @@ class CRM_Price_Page_Field extends CRM_Core_Page {
       $htmlTypes = CRM_Price_BAO_PriceField::htmlTypes();
       $priceField[$priceFieldBAO->id]['html_type'] = $htmlTypes[$priceField[$priceFieldBAO->id]['html_type']];
       $priceField[$priceFieldBAO->id]['order'] = $priceField[$priceFieldBAO->id]['weight'];
-      $priceField[$priceFieldBAO->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(), $action,
+      $priceField[$priceFieldBAO->id]['action'] = CRM_Core_Action::formLink(
+        self::actionLinks(),
+        $action,
         array(
           'fid' => $priceFieldBAO->id,
           'sid' => $this->_sid,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'priceField.row.actions',
+        'PriceField',
+        $priceFieldBAO->id
       );
     }
 
index 35e73e59bc8ff1e484f0629254f1f4d078d0180d..8662d8c4ef571715d90a3e793cfd51003a2466bd 100644 (file)
@@ -162,7 +162,12 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
           'oid' => $id,
           'fid' => $this->_fid,
           'sid' => $this->_sid,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'priceFieldValue.row.actions',
+        'PriceFieldValue',
+        $id
       );
     }
     // Add order changing widget to selector
index c233468a278d28f37cf2183b21c142175040da60..d5767a06050cf38721f164b07130b99388e4f4a1 100644 (file)
@@ -300,7 +300,12 @@ class CRM_Price_Page_Set extends CRM_Core_Page {
         $actionLinks[CRM_Core_Action::BROWSE]['name'] = 'View Price Fields';
       }
       $priceSet[$dao->id]['action'] = CRM_Core_Action::formLink($actionLinks, $action,
-        array('sid' => $dao->id)
+        array('sid' => $dao->id),
+        ts('more'),
+        FALSE,
+        'priceSet.row.actions',
+        'PriceSet',
+        $dao->id
       );
     }
     $this->assign('rows', $priceSet);
index 5e65cdc06859f4e0a27d5ced1d4c03e278e4d267..fddc3c69d89b16367212775350655dba33ee9748 100644 (file)
@@ -234,8 +234,16 @@ class CRM_Profile_Page_MultipleRecordFieldsListing extends CRM_Core_Page_Basic {
              if ($pageCheckSum) {
                $actionParams['cs'] = $pageCheckSum;
              }
-             $value['action'] =
-               CRM_Core_Action::formLink($links, $linkAction, $actionParams);
+             $value['action'] = CRM_Core_Action::formLink(
+               $links,
+               $linkAction,
+               $actionParams,
+               ts('more'),
+               FALSE,
+               'profile.multiValue.row',
+               'customValue',
+               $fieldId // not ideal, but the one thing not sent in $actionParams
+             );
            }
          }
        }
index 39fd3d4de55d915b826a7fb7cb25eb9d15f164ca..963a7f473b7361f475b94b63e7cce8e5239c2409 100644 (file)
@@ -698,7 +698,12 @@ class CRM_Profile_Selector_Listings extends CRM_Core_Selector_Base implements CR
 
       $row[] = CRM_Core_Action::formLink($newLinks,
         $mask,
-        $params
+        $params,
+        ts('more'),
+        FALSE,
+        'profile.selector.row',
+        'Contact',
+        $result->contact_id
       );
 
       if (!$empty) {
index 9390528caf0f533a239815550cfa4a833a09a0a6..4b58e551d39f5e7ecfc1119fc9c9e00e384c9666 100644 (file)
@@ -147,7 +147,12 @@ class CRM_SMS_Page_Provider extends CRM_Core_Page_Basic {
       $provider['api_type'] = $apiTypes[$provider['api_type']];
 
       $provider['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $provider['id'])
+        array('id' => $provider['id']),
+        ts('more'),
+        FALSE,
+        'sms.provider.row',
+        'SMSProvider',
+        $provider['id']
       );
       $rows[] = $provider;
     }
index af95d000100d0089f00102f65fb116264d83187f..bd3ab1e0470cb7a26cf622400e36f6f4d2e6e354 100644 (file)
@@ -171,7 +171,12 @@ class CRM_UF_Page_Field extends CRM_Core_Page {
         array(
           'id' => $ufFieldBAO->id,
           'gid' => $this->_gid,
-        )
+        ),
+        ts('more'),
+        FALSE,
+        'ufField.row.actions',
+        'UFField',
+        $ufFieldBAO->id
       );
     }
 
index bde50907584d202be33b6524e53372125c560e2b..833ef07905f8386f6f3153568971abb16d6c6375 100644 (file)
@@ -362,7 +362,12 @@ class CRM_UF_Page_Group extends CRM_Core_Page {
       $ufGroup[$id]['group_type'] = $groupTypesString;
 
       $ufGroup[$id]['action'] = CRM_Core_Action::formLink(self::actionLinks(), $action,
-        array('id' => $id)
+        array('id' => $id),
+        ts('more'),
+        FALSE,
+        'ufGroup.row.actions',
+        'UFGroup',
+        $id
       );
       //get the "Used For" from uf_join
       $ufGroup[$id]['module'] = implode(', ', CRM_Core_BAO_UFGroup::getUFJoinRecord($id, TRUE));
index fbb789ce3661dda7d695fd7014744dc988c0229b..7e0a02f19a30d035e8bb89980edcc6555c65b411 100644 (file)
@@ -87,19 +87,19 @@ abstract class CRM_Utils_Hook {
   }
 
   abstract function invoke($numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
     $fnSuffix
   );
 
   function commonInvoke($numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
     $fnSuffix, $fnPrefix
   ) {
 
     $this->commonBuildModuleList($fnPrefix);
 
     return $this->runHooks($this->commonCiviModules, $fnSuffix,
-      $numParams, $arg1, $arg2, $arg3, $arg4, $arg5
+      $numParams, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6
     );
   }
 
@@ -127,7 +127,7 @@ abstract class CRM_Utils_Hook {
   }
 
   function runHooks($civiModules, $fnSuffix, $numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5
+    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6
   ) {
     // $civiModules is *not* passed by reference because runHooks
     // must be reentrant. PHP is finicky about running
@@ -164,6 +164,10 @@ abstract class CRM_Utils_Hook {
               $fResult = $fnName($arg1, $arg2, $arg3, $arg4, $arg5);
               break;
 
+            case 6:
+              $fResult = $fnName($arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
+              break;
+              
             default:
               CRM_Core_Error::fatal(ts('Invalid hook invocation'));
               break;
@@ -208,7 +212,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function pre($op, $objectName, $id, &$params) {
-    return self::singleton()->invoke(4, $op, $objectName, $id, $params, $op, 'civicrm_pre');
+    return self::singleton()->invoke(4, $op, $objectName, $id, $params, self::$_nullObject, self::$_nullObject, 'civicrm_pre');
   }
 
   /**
@@ -224,7 +228,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function post($op, $objectName, $objectId, &$objectRef) {
-    return self::singleton()->invoke(4, $op, $objectName, $objectId, $objectRef, $op, 'civicrm_post');
+    return self::singleton()->invoke(4, $op, $objectName, $objectId, $objectRef, self::$_nullObject, self::$_nullObject, 'civicrm_post');
   }
 
   /**
@@ -234,14 +238,16 @@ abstract class CRM_Utils_Hook {
    * @param string $op         the type of operation being performed
    * @param string $objectName the name of the object
    * @param int    $objectId   the unique identifier for the object
-   * @params array $links      (optional ) the links array (introduced in v3.2)
+   * @param array  $links      (optional) the links array (introduced in v3.2)
+   * @param int    $mask       (optional) the bitmask to show/hide links
+   * @param array  $values     (optional) the values to fill the links
    *
    * @return array|null        an array of arrays, each element is a tuple consisting of id, url, img, title, weight
    *
    * @access public
    */
-  static function links($op, $objectName, &$objectId, &$links, &$mask = NULL) {
-    return self::singleton()->invoke(5, $op, $objectName, $objectId, $links, $mask, 'civicrm_links');
+  static function links($op, $objectName, &$objectId, &$links, &$mask = NULL, &$values = array()) {
+    return self::singleton()->invoke(6, $op, $objectName, $objectId, $links, $mask, $values, 'civicrm_links');
   }
 
   /**
@@ -254,7 +260,7 @@ abstract class CRM_Utils_Hook {
    * @return null the return value is ignored
    */
   static function buildForm($formName, &$form) {
-    return self::singleton()->invoke(2, $formName, $form, $formName, $formName, $formName, 'civicrm_buildForm');
+    return self::singleton()->invoke(2, $formName, $form, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_buildForm');
   }
 
   /**
@@ -267,7 +273,7 @@ abstract class CRM_Utils_Hook {
    * @return null the return value is ignored
    */
   static function postProcess($formName, &$form) {
-    return self::singleton()->invoke(2, $formName, $form, $formName, $formName, $formName, 'civicrm_postProcess');
+    return self::singleton()->invoke(2, $formName, $form, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_postProcess');
   }
 
   /**
@@ -284,7 +290,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function validate($formName, &$fields, &$files, &$form) {
-    return self::singleton()->invoke(4, $formName, $fields, $files, $form, $formName, 'civicrm_validate');
+    return self::singleton()->invoke(4, $formName, $fields, $files, $form, self::$_nullObject, self::$_nullObject, 'civicrm_validate');
   }
 
   /**
@@ -302,7 +308,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function validateForm($formName, &$fields, &$files, &$form, &$errors) {
-    return self::singleton()->invoke(5, $formName, $fields, $files, $form, $errors, 'civicrm_validateForm');
+    return self::singleton()->invoke(5, $formName, $fields, $files, $form, $errors, self::$_nullObject, 'civicrm_validateForm');
   }
 
   /**
@@ -317,7 +323,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function custom($op, $groupID, $entityID, &$params) {
-    return self::singleton()->invoke(4, $op, $groupID, $entityID, $params, $op, 'civicrm_custom');
+    return self::singleton()->invoke(4, $op, $groupID, $entityID, $params, self::$_nullObject, self::$_nullObject, 'civicrm_custom');
   }
 
   /**
@@ -334,7 +340,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function aclWhereClause($type, &$tables, &$whereTables, &$contactID, &$where) {
-    return self::singleton()->invoke(5, $type, $tables, $whereTables, $contactID, $where, 'civicrm_aclWhereClause');
+    return self::singleton()->invoke(5, $type, $tables, $whereTables, $contactID, $where, self::$_nullObject, 'civicrm_aclWhereClause');
   }
 
   /**
@@ -351,7 +357,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function aclGroup($type, $contactID, $tableName, &$allGroups, &$currentGroups) {
-    return self::singleton()->invoke(5, $type, $contactID, $tableName, $allGroups, $currentGroups, 'civicrm_aclGroup');
+    return self::singleton()->invoke(5, $type, $contactID, $tableName, $allGroups, $currentGroups, self::$_nullObject, 'civicrm_aclGroup');
   }
 
   /**
@@ -364,7 +370,7 @@ abstract class CRM_Utils_Hook {
    */
   static function xmlMenu(&$files) {
     return self::singleton()->invoke(1, $files,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_xmlMenu'
     );
   }
@@ -379,7 +385,7 @@ abstract class CRM_Utils_Hook {
    */
   static function managed(&$entities) {
     return self::singleton()->invoke(1, $entities,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_managed'
     );
   }
@@ -396,7 +402,7 @@ abstract class CRM_Utils_Hook {
    */
   static function dashboard($contactID, &$contentPlacement = self::DASHBOARD_BELOW) {
     $retval = self::singleton()->invoke(2, $contactID, $contentPlacement,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_dashboard'
     );
 
@@ -422,7 +428,7 @@ abstract class CRM_Utils_Hook {
    */
   static function recent(&$recentArray) {
     return self::singleton()->invoke(1, $recentArray,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_recent'
     );
   }
@@ -439,7 +445,7 @@ abstract class CRM_Utils_Hook {
    */
   static function buildAmount($pageType, &$form, &$amount) {
     return self::singleton()->invoke(3, $pageType, $form, $amount, self::$_nullObject,
-      self::$_nullObject, 'civicrm_buildAmount');
+      self::$_nullObject, self::$_nullObject, 'civicrm_buildAmount');
   }
 
   /**
@@ -452,7 +458,7 @@ abstract class CRM_Utils_Hook {
    */
   static function buildStateProvinceForCountry($countryID, &$states) {
     return self::singleton()->invoke(2, $countryID, $states,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_buildStateProvinceForCountry'
     );
   }
@@ -468,7 +474,7 @@ abstract class CRM_Utils_Hook {
    */
   static function tabs(&$tabs, $contactID) {
     return self::singleton()->invoke(2, $tabs, $contactID,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_tabs'
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_tabs'
     );
   }
 
@@ -484,7 +490,7 @@ abstract class CRM_Utils_Hook {
    */
   static function tabset($tabsetName, &$tabs, $context) {
     return self::singleton()->invoke(3, $tabsetName, $tabs,
-      $context, self::$_nullObject, self::$_nullObject, 'civicrm_tabset'
+      $context, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_tabset'
     );
   }
 
@@ -498,7 +504,7 @@ abstract class CRM_Utils_Hook {
    */
   static function tokens(&$tokens) {
     return self::singleton()->invoke(1, $tokens,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_tokens'
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_tokens'
     );
   }
 
@@ -521,7 +527,7 @@ abstract class CRM_Utils_Hook {
     $tokens    = array(),
     $className = NULL
   ) {
-    return self::singleton()->invoke(5, $details, $contactIDs, $jobID, $tokens, $className, 'civicrm_tokenValues');
+    return self::singleton()->invoke(5, $details, $contactIDs, $jobID, $tokens, $className, self::$_nullObject, 'civicrm_tokenValues');
   }
 
   /**
@@ -535,7 +541,7 @@ abstract class CRM_Utils_Hook {
    */
   static function pageRun(&$page) {
     return self::singleton()->invoke(1, $page,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_pageRun'
     );
   }
@@ -552,7 +558,7 @@ abstract class CRM_Utils_Hook {
    */
   static function copy($objectName, &$object) {
     return self::singleton()->invoke(2, $objectName, $object,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_copy'
     );
   }
@@ -569,7 +575,7 @@ abstract class CRM_Utils_Hook {
    *
    **/
   static function unsubscribeGroups($op, $mailingId, $contactId, &$groups, &$baseGroups) {
-    return self::singleton()->invoke(5, $op, $mailingId, $contactId, $groups, $baseGroups, 'civicrm_unsubscribeGroups');
+    return self::singleton()->invoke(5, $op, $mailingId, $contactId, $groups, $baseGroups, self::$_nullObject, 'civicrm_unsubscribeGroups');
   }
 
   /**
@@ -587,7 +593,7 @@ abstract class CRM_Utils_Hook {
    */
   static function customFieldOptions($customFieldID, &$options, $detailedFormat = FALSE) {
     return self::singleton()->invoke(3, $customFieldID, $options, $detailedFormat,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_customFieldOptions'
     );
   }
@@ -609,14 +615,14 @@ abstract class CRM_Utils_Hook {
    */
   static function searchTasks($objectType, &$tasks) {
     return self::singleton()->invoke(2, $objectType, $tasks,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_searchTasks'
     );
   }
 
   static function eventDiscount(&$form, &$params) {
     return self::singleton()->invoke(2, $form, $params,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_eventDiscount'
     );
   }
@@ -630,7 +636,7 @@ abstract class CRM_Utils_Hook {
    */
   static function mailingGroups(&$form, &$groups, &$mailings) {
     return self::singleton()->invoke(3, $form, $groups, $mailings,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_mailingGroups'
     );
   }
@@ -647,7 +653,7 @@ abstract class CRM_Utils_Hook {
    */
   static function membershipTypeValues(&$form, &$membershipTypes) {
     return self::singleton()->invoke(2, $form, $membershipTypes,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_membershipTypeValues'
     );
   }
@@ -664,7 +670,7 @@ abstract class CRM_Utils_Hook {
    */
   static function summary($contactID, &$content, &$contentPlacement = self::SUMMARY_BELOW) {
     return self::singleton()->invoke(3, $contactID, $content, $contentPlacement,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_summary'
     );
   }
@@ -689,7 +695,7 @@ abstract class CRM_Utils_Hook {
    */
   static function contactListQuery(&$query, $name, $context, $id) {
     return self::singleton()->invoke(4, $query, $name, $context, $id,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_contactListQuery'
     );
   }
@@ -716,7 +722,7 @@ abstract class CRM_Utils_Hook {
     &$cookedParams
   ) {
     return self::singleton()->invoke(3, $paymentObj, $rawParams, $cookedParams,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_alterPaymentProcessorParams'
     );
   }
@@ -730,7 +736,7 @@ abstract class CRM_Utils_Hook {
    */
   static function alterMailParams(&$params, $context = NULL) {
     return self::singleton()->invoke(2, $params, $context,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_alterMailParams'
     );
   }
@@ -746,7 +752,7 @@ abstract class CRM_Utils_Hook {
    */
   static function caseSummary($caseID) {
     return self::singleton()->invoke(1, $caseID,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_caseSummary'
     );
   }
@@ -758,7 +764,7 @@ abstract class CRM_Utils_Hook {
    * @return void
    */
   static function caseTypes(&$caseTypes) {
-    return self::singleton()->invoke(1, $caseTypes, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_caseTypes');
+    return self::singleton()->invoke(1, $caseTypes, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_caseTypes');
   }
 
   /**
@@ -769,14 +775,14 @@ abstract class CRM_Utils_Hook {
    */
   static function config(&$config) {
     return self::singleton()->invoke(1, $config,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_config'
     );
   }
 
   static function enableDisable($recordBAO, $recordID, $isActive) {
     return self::singleton()->invoke(3, $recordBAO, $recordID, $isActive,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_enableDisable'
     );
   }
@@ -791,7 +797,7 @@ abstract class CRM_Utils_Hook {
    */
   static function optionValues(&$options, $name) {
     return self::singleton()->invoke(2, $options, $name,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_optionValues'
     );
   }
@@ -804,7 +810,7 @@ abstract class CRM_Utils_Hook {
    */
   static function navigationMenu(&$params) {
     return self::singleton()->invoke(1, $params,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_navigationMenu'
     );
   }
@@ -821,7 +827,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function merge($type, &$data, $mainId = NULL, $otherId = NULL, $tables = NULL) {
-    return self::singleton()->invoke(5, $type, $data, $mainId, $otherId, $tables, 'civicrm_merge');
+    return self::singleton()->invoke(5, $type, $data, $mainId, $otherId, $tables, self::$_nullObject, 'civicrm_merge');
   }
 
   /**
@@ -833,7 +839,7 @@ abstract class CRM_Utils_Hook {
    */
   static function notePrivacy(&$noteValues) {
     return self::singleton()->invoke(1, $noteValues,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_notePrivacy'
     );
   }
@@ -851,7 +857,7 @@ abstract class CRM_Utils_Hook {
    */
   static function export(&$exportTempTable, &$headerRows, &$sqlColumns, &$exportMode) {
     return self::singleton()->invoke(4, $exportTempTable, $headerRows, $sqlColumns, $exportMode,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_export'
     );
   }
@@ -867,7 +873,7 @@ abstract class CRM_Utils_Hook {
    */
   static function dupeQuery($obj, $type, &$query) {
     return self::singleton()->invoke(3, $obj, $type, $query,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_dupeQuery'
     );
   }
@@ -884,7 +890,7 @@ abstract class CRM_Utils_Hook {
    * @access public
    */
   static function emailProcessor($type, &$params, $mail, &$result, $action = NULL) {
-    return self::singleton()->invoke(5, $type, $params, $mail, $result, $action, 'civicrm_emailProcessor');
+    return self::singleton()->invoke(5, $type, $params, $mail, $result, $action, self::$_nullObject, 'civicrm_emailProcessor');
   }
 
   /**
@@ -907,7 +913,7 @@ abstract class CRM_Utils_Hook {
    */
   static function import($object, $usage, &$objectRef, &$params) {
     return self::singleton()->invoke(4, $object, $usage, $objectRef, $params,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_import'
     );
   }
@@ -923,7 +929,7 @@ abstract class CRM_Utils_Hook {
    */
   static function alterAPIPermissions($entity, $action, &$params, &$permissions) {
     return self::singleton()->invoke(4, $entity, $action, $params, $permissions,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_alterAPIPermissions'
     );
   }
@@ -931,7 +937,7 @@ abstract class CRM_Utils_Hook {
   static function postSave(&$dao) {
     $hookName = 'civicrm_postSave_' . $dao->getTableName();
     return self::singleton()->invoke(1, $dao,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       $hookName
     );
   }
@@ -944,7 +950,7 @@ abstract class CRM_Utils_Hook {
    */
   static function summaryActions(&$actions, $contactID = NULL) {
     return self::singleton()->invoke(2, $actions, $contactID,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_summaryActions'
     );
   }
@@ -969,7 +975,7 @@ abstract class CRM_Utils_Hook {
    */
   static function searchColumns($objectName, &$headers, &$rows, &$selector) {
     return self::singleton()->invoke(4, $objectName, $headers, $rows, $selector,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_searchColumns'
     );
   }
@@ -985,7 +991,7 @@ abstract class CRM_Utils_Hook {
    */
   static function buildUFGroupsForModule($moduleName, &$ufGroups) {
     return self::singleton()->invoke(2, $moduleName, $ufGroups,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_buildUFGroupsForModule'
     );
   }
@@ -1008,7 +1014,7 @@ abstract class CRM_Utils_Hook {
    */
   static function emailProcessorContact($email, $contactID, &$result) {
     return self::singleton()->invoke(3, $email, $contactID, $result,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_emailProcessorContact'
     );
   }
@@ -1047,7 +1053,7 @@ abstract class CRM_Utils_Hook {
   static function alterMailingLabelParams(&$args) {
     return self::singleton()->invoke(1, $args,
       self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_alterMailingLabelParams'
     );
   }
@@ -1064,7 +1070,7 @@ abstract class CRM_Utils_Hook {
    */
   static function alterContent(&$content, $context, $tplName, &$object) {
     return self::singleton()->invoke(4, $content, $context, $tplName, $object,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_alterContent'
     );
   }
@@ -1082,7 +1088,7 @@ abstract class CRM_Utils_Hook {
    */
   static function alterTemplateFile($formName, &$form, $context, &$tplName) {
     return self::singleton()->invoke(4, $formName, $form, $context, $tplName,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_alterTemplateFile'
     );
   }
@@ -1102,7 +1108,7 @@ abstract class CRM_Utils_Hook {
    */
   static function triggerInfo(&$info, $tableName = NULL) {
     return self::singleton()->invoke(2, $info, $tableName,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       self::$_nullObject,
       'civicrm_triggerInfo'
     );
@@ -1116,7 +1122,7 @@ abstract class CRM_Utils_Hook {
   static function install() {
     return self::singleton()->invoke(0, self::$_nullObject,
       self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_install'
     );
   }
@@ -1129,7 +1135,7 @@ abstract class CRM_Utils_Hook {
   static function uninstall() {
     return self::singleton()->invoke(0, self::$_nullObject,
       self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_uninstall'
     );
   }
@@ -1142,7 +1148,7 @@ abstract class CRM_Utils_Hook {
   static function enable() {
     return self::singleton()->invoke(0, self::$_nullObject,
       self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_enable'
     );
   }
@@ -1155,7 +1161,7 @@ abstract class CRM_Utils_Hook {
   static function disable() {
     return self::singleton()->invoke(0, self::$_nullObject,
       self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_disable'
     );
   }
@@ -1163,7 +1169,7 @@ abstract class CRM_Utils_Hook {
   static function alterReportVar($varType, &$var, &$object) {
     return self::singleton()->invoke(3, $varType, $var, $object,
       self::$_nullObject,
-      self::$_nullObject,
+      self::$_nullObject, self::$_nullObject,
       'civicrm_alterReportVar'
     );
   }
@@ -1180,7 +1186,7 @@ abstract class CRM_Utils_Hook {
    */
   static function upgrade($op, CRM_Queue_Queue $queue = NULL) {
     return self::singleton()->invoke(2, $op, $queue,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       self::$_nullObject,
       'civicrm_upgrade'
     );
@@ -1195,7 +1201,7 @@ abstract class CRM_Utils_Hook {
   static function postEmailSend(&$params) {
     return self::singleton()->invoke(1, $params,
       self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_postEmailSend'
     );
   }
@@ -1208,7 +1214,7 @@ abstract class CRM_Utils_Hook {
   static function alterSettingsFolders(&$settingsFolders) {
     return self::singleton()->invoke(1, $settingsFolders,
         self::$_nullObject, self::$_nullObject,
-        self::$_nullObject, self::$_nullObject,
+        self::$_nullObject, self::$_nullObject, self::$_nullObject,
         'civicrm_alterSettingsFolders'
     );
   }
@@ -1223,7 +1229,7 @@ abstract class CRM_Utils_Hook {
   static function alterSettingsMetaData(&$settingsMetaData, $domainID, $profile) {
     return self::singleton()->invoke(3, $settingsMetaData,
         $domainID, $profile,
-        self::$_nullObject, self::$_nullObject,
+        self::$_nullObject, self::$_nullObject, self::$_nullObject,
         'civicrm_alterSettingsMetaData'
     );
   }
@@ -1239,7 +1245,7 @@ abstract class CRM_Utils_Hook {
   static function apiWrappers(&$wrappers, $apiRequest) {
     return self::singleton()
       ->invoke(2, $wrappers, $apiRequest, self::$_nullObject, self::$_nullObject, self::$_nullObject,
-      'civicrm_apiWrappers'
+      self::$_nullObject, 'civicrm_apiWrappers'
     );
   }
 
@@ -1253,7 +1259,7 @@ abstract class CRM_Utils_Hook {
    */
   static function cron($jobManager) {
     return self::singleton()->invoke(1,
-      $jobManager, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      $jobManager, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_cron'
     );
   }
@@ -1270,7 +1276,7 @@ abstract class CRM_Utils_Hook {
    */
   static function permission(&$permissions) {
     return self::singleton()->invoke(1, $permissions,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject,
       'civicrm_permission'
     );
   }
@@ -1289,7 +1295,7 @@ abstract class CRM_Utils_Hook {
    */
   static function entityTypes(&$entityTypes) {
     return self::singleton()->invoke(1, $entityTypes, self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, self::$_nullObject, 'civicrm_entityTypes'
+      self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_entityTypes'
     );
   }
 
@@ -1301,7 +1307,7 @@ abstract class CRM_Utils_Hook {
    */
   static function buildProfile($name) {
     return self::singleton()->invoke(1, $name, self::$_nullObject, self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, 'civicrm_buildProfile');
+      self::$_nullObject, self::$_nullObject, 'civicrm_buildProfile');
   }
 
   /**
@@ -1312,7 +1318,7 @@ abstract class CRM_Utils_Hook {
    */
   static function validateProfile($name) {
     return self::singleton()->invoke(1, $name, self::$_nullObject, self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, 'civicrm_validateProfile');
+      self::$_nullObject, self::$_nullObject, 'civicrm_validateProfile');
   }
 
   /**
@@ -1323,7 +1329,7 @@ abstract class CRM_Utils_Hook {
    */
   static function processProfile($name) {
     return self::singleton()->invoke(1, $name, self::$_nullObject, self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, 'civicrm_processProfile');
+      self::$_nullObject, self::$_nullObject, 'civicrm_processProfile');
   }
 
   /**
@@ -1334,7 +1340,7 @@ abstract class CRM_Utils_Hook {
    */
   static function viewProfile($name) {
     return self::singleton()->invoke(1, $name, self::$_nullObject, self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, 'civicrm_viewProfile');
+      self::$_nullObject, self::$_nullObject, 'civicrm_viewProfile');
   }
 
   /**
@@ -1345,7 +1351,7 @@ abstract class CRM_Utils_Hook {
    */
   static function searchProfile($name) {
     return self::singleton()->invoke(1, $name, self::$_nullObject, self::$_nullObject, self::$_nullObject,
-      self::$_nullObject, 'civicrm_searchProfile');
+      self::$_nullObject, self::$_nullObject, 'civicrm_searchProfile');
   }
 
   /**
@@ -1359,7 +1365,7 @@ abstract class CRM_Utils_Hook {
    */
   static function alterBarcode( &$data, $type = 'barcode', $context = 'name_badge' ) {
     return self::singleton()->invoke(3, $data, $type, $context, self::$_nullObject,
-      self::$_nullObject, 'civicrm_alterBarcode');
+      self::$_nullObject, self::$_nullObject, 'civicrm_alterBarcode');
   }
 
   /**
@@ -1375,7 +1381,7 @@ abstract class CRM_Utils_Hook {
    */
   static function alterMail(&$mailer, $driver, $params) {
     return self::singleton()
-      ->invoke(3, $mailer, $driver, $params, self::$_nullObject, self::$_nullObject, 'civicrm_alterMailer');
+      ->invoke(3, $mailer, $driver, $params, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_alterMailer');
   }
 
   /**
@@ -1386,6 +1392,6 @@ abstract class CRM_Utils_Hook {
    * @return void
    */
   static function queryObjects(&$queryObjects, $type = 'Contact') {
-    return self::singleton()->invoke(2, $queryObjects, $type, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_queryObjects');
+    return self::singleton()->invoke(2, $queryObjects, $type, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_queryObjects');
   }
 }
index 65f148358cd8d9689d857fb06635918d21544a0e..5b3e169cfde8b3dfdeda7ea2818d4d609c7b7785 100644 (file)
@@ -56,14 +56,14 @@ class CRM_Utils_Hook_Drupal extends CRM_Utils_Hook {
   private $drupalModules = NULL;
 
   function invoke($numParams,
-                  &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+                  &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
                   $fnSuffix
   ) {
 
     $this->buildModuleList();
 
     return $this->runHooks($this->allModules, $fnSuffix,
-      $numParams, $arg1, $arg2, $arg3, $arg4, $arg5
+      $numParams, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6
     );
   }
 
index e9fb53dc6f98deed5376c895a5f84a3a306c16b0..7cde491c40d7e9d0396aa80130db6bed0a338724 100644 (file)
@@ -55,14 +55,14 @@ class CRM_Utils_Hook_Drupal6 extends CRM_Utils_Hook {
   private $drupalModules = NULL;
 
   function invoke($numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
     $fnSuffix
   ) {
 
     $this->buildModuleList();
 
     return $this->runHooks($this->allModules, $fnSuffix,
-      $numParams, $arg1, $arg2, $arg3, $arg4, $arg5
+      $numParams, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6
     );
   }
 
index 94d7f0a58e0db5b21e5fecece50be8fdc75cca4f..ec9123cba7fe8dcaab54a8bf927ce2c9b300920b 100644 (file)
@@ -35,7 +35,7 @@
  */
 class CRM_Utils_Hook_Joomla extends CRM_Utils_Hook {
   function invoke($numParams,
-                  &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+                  &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6
                   $fnSuffix
   ) {
     // ensure that we are running in a joomla context
@@ -60,10 +60,10 @@ class CRM_Utils_Hook_Joomla extends CRM_Utils_Hook {
         }
       }
 
-      $result = $app->triggerEvent($fnSuffix, array(&$arg1, &$arg2, &$arg3, &$arg4, &$arg5));
+      $result = $app->triggerEvent($fnSuffix, array(&$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6));
 
       $moduleResult = $this->commonInvoke($numParams,
-        $arg1, $arg2, $arg3, $arg4, $arg5,
+        $arg1, $arg2, $arg3, $arg4, $arg5, $arg6,
         $fnSuffix, 'joomla');
       if (!empty($moduleResult) && is_array($moduleResult)) {
         if (empty($result)) {
index 7dcfe641ba01550767915888b7a39639b627e324..b66559b0f6b3b91b6e53035960df4a22843ecb40 100644 (file)
@@ -35,7 +35,7 @@
  */
 class CRM_Utils_Hook_Soap extends CRM_Utils_Hook {
   function invoke($numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
     $fnSuffix
   ) {
     // suppress all hok calls during soap
index d2cf361828a08dd9f1c4105b7176bd8e94f26d82..5f934e8269cfcda92f0be325b3f58ab6073a6b9e 100644 (file)
@@ -61,19 +61,19 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook {
   }
 
   function invoke($numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
     $fnSuffix) {
 
-    $params = array( &$arg1, &$arg2, &$arg3, &$arg4, &$arg5);
+    $params = array( &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6);
 
     if ($this->civiModules === NULL) {
       $this->civiModules = array();
       $this->requireCiviModules($this->civiModules);
     }
-    $this->runHooks($this->civiModules, $fnSuffix, $numParams, $arg1, $arg2, $arg3, $arg4, $arg5);
+    $this->runHooks($this->civiModules, $fnSuffix, $numParams, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 
     if ($this->mockObject && is_callable(array($this->mockObject, $fnSuffix))) {
-      call_user_func(array($this->mockObject, $fnSuffix), $arg1, $arg2, $arg3, $arg4, $arg5);
+      call_user_func(array($this->mockObject, $fnSuffix), $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
     }
     if (!empty($this->adhocHooks[$fnSuffix])) {
       call_user_func_array($this->adhocHooks[$fnSuffix], $params );
index 3fdab4906c9e62ff83814ba5e3ea79a90d401417..d8c1745bd064657e3da848f03df08e7d653fa1c1 100644 (file)
  */
 class CRM_Utils_Hook_WordPress extends CRM_Utils_Hook {
   function invoke($numParams,
-    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5,
+    &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
     $fnSuffix
   ) {
     return $this->commonInvoke($numParams,
-      $arg1, $arg2, $arg3, $arg4, $arg5,
+      $arg1, $arg2, $arg3, $arg4, $arg5, $arg6,
       $fnSuffix, 'wordpress'
     );
   }