CRM-12675 - Hide Contribution activities from users without Access CiviContribute...

[civicrm-core.git] / CRM / Activity / Form / Task.php

diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
index e1c8ec08d22a16ecc0c2d65832ae496dbe6fb7ed..13819f62124b5e04e1dbcebb4ad07d737c0c5439 100644 (file)
--- a/CRM/Activity/Form/Task.php
+++ b/CRM/Activity/Form/Task.php
@@ -113,7 +113,14 @@ class CRM_Activity_Form_Task extends CRM_Core_Form {
       );
       $query->_distinctComponentClause = '( civicrm_activity.id )';
       $query->_groupByComponentClause = " GROUP BY civicrm_activity.id ";
-      $result = $query->searchQuery(0, 0, NULL);
+
+      // CRM-12675
+      $activityClause = NULL;
+      if (! CRM_Core_Permission::check('access CiviContribute')) {
+        $activityClause = ' (activity_type.component_id IS NULL OR activity_type.component_id <> 2) ';
+      }
+
+      $result = $query->searchQuery(0, 0, NULL, FALSE, FALSE, FALSE, FALSE, FALSE, $activityClause);
 
       while ($result->fetch()) {
         if (!empty($result->activity_id)) {