CRM-12675 : cleanup - Contribution activities shown to users without permission

https://issues.civicrm.org/jira/browse/CRM-12675

diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
index 0ce725dcaec5500021211544f85b90a653ba87f5..64aa3fa841582dfa30fe22fad698795a8ad98a74 100644 (file)
--- a/CRM/Activity/Form/Task.php
+++ b/CRM/Activity/Form/Task.php
@@ -118,9 +118,10 @@ class CRM_Activity_Form_Task extends CRM_Core_Form {
       $activityClause = NULL;
 
       $components = CRM_Core_Component::getNames();
+      $componentClause = array();
       foreach ($components as $componentID => $componentName) {
         if (!CRM_Core_Permission::check("access $componentName")) {
-          $componentClause = " (activity_type.component_id IS NULL OR activity_type.component_id <> {$componentID}) ";
+          $componentClause[] = " (activity_type.component_id IS NULL OR activity_type.component_id <> {$componentID}) ";
         }
       }
       if (!empty($componentClause)) {

diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php
index 59d6d8b31d99b16971beb163c80a7320a3fd6d11..090ed4b0eb8530bcb6c89510c0f99e6c2c22a69b 100644 (file)
--- a/CRM/Activity/Selector/Search.php
+++ b/CRM/Activity/Selector/Search.php
@@ -175,6 +175,7 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
 
     // CRM-12675
     $components = CRM_Core_Component::getNames();
+    $componentClause = array();
     foreach ($components as $componentID => $componentName) {
       if (!CRM_Core_Permission::check("access $componentName")) {
         $componentClause[] = " (activity_type.component_id IS NULL OR activity_type.component_id <> {$componentID}) ";