From: Franck Villaume <franck.villaume@trivialdev.com>
Date: Sun, 17 Mar 2013 16:36:33 +0000 (+0100)
Subject: RBAC: fix tracker & task check
X-Git-Tag: v5.2.2~42^2~2
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=c3ed6334c5c06ac80c7fa83592e50f04e8d1fd07

RBAC: fix tracker & task check
---

diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index 6a2cf1ad14..7176247b65 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -4,7 +4,7 @@
  *
  * Copyright 2004, GForge, LLC
  * Copyright 2009-2010, Roland Mas
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012-2013, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -864,6 +864,9 @@ abstract class BaseRole extends Error {
 		$new_sa['tracker'] = array () ;
 		$new_pa['tracker'] = array () ;
 		foreach ($projects as $p) {
+			if (!$p->usesTracker()) {
+				continue;
+			}
 			$atf = new ArtifactTypeFactory ($p) ;
 			if (!$atf->isError()) {
 				$trackerids = $atf->getAllArtifactTypeIds () ;
@@ -903,6 +906,9 @@ abstract class BaseRole extends Error {
 		$new_sa['pm'] = array () ;
 		$new_pa['pm'] = array () ;
 		foreach ($projects as $p) {
+			if (!$p->usesPM()) {
+				continue;
+			}
 			$pgf = new ProjectGroupFactory ($p) ;
 			$pgids = $pgf->getAllProjectGroupIds () ;
 			foreach ($pgids as $gid) {