From a3576320ae763e596e729e3ad5ef9dbb6967e23d Mon Sep 17 00:00:00 2001
From: Roland Mas <lolando@debian.org>
Date: Fri, 16 Sep 2011 16:24:42 +0000
Subject: [PATCH] Merged from 5.1: a handful of fixes

---
 src/common/include/RBAC.php        | 14 +++++++-------
 src/docs/docbook/Makefile          |  2 +-
 src/www/project/admin/roleedit.php |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index 29433c2c1c..a8efcc256f 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -693,13 +693,13 @@ abstract class BaseRole extends Error {
 		foreach ($data as $sect => $refs) {
 			foreach ($refs as $refid => $value) {
 				$this->setSetting ($sect, $refid, $value) ;
-			}
-			if ($sect == 'scm') {
-				foreach ($this->getUsers() as $u) {
-					if (!$SYS->sysGroupCheckUser($refid,$u->getID())) {
-						$this->setError($SYS->getErrorMessage());
-						db_rollback();
-						return false;
+				if ($sect == 'scm') {
+					foreach ($this->getUsers() as $u) {
+						if (!$SYS->sysGroupCheckUser($refid,$u->getID())) {
+							$this->setError($SYS->getErrorMessage());
+							db_rollback();
+							return false;
+						}
 					}
 				}
 			}
diff --git a/src/docs/docbook/Makefile b/src/docs/docbook/Makefile
index ac8fd5e454..21d2d645a5 100644
--- a/src/docs/docbook/Makefile
+++ b/src/docs/docbook/Makefile
@@ -9,7 +9,7 @@ DB2LATEX_XSL = ${XSL}db2latex/
 XSLFOP = /usr/share/xml/docbook/stylesheet/docbook-xsl/fo/
 FOP = fop
 #DEVNULL = >>/tmp/debug 2>&1
-DEVNULL = &> /dev/null
+DEVNULL = >/dev/null 2>&1
 
 BOOKS=gforge_manual
 ARTICLES=administration_guide user_guide contribution_guide installation_guide
diff --git a/src/www/project/admin/roleedit.php b/src/www/project/admin/roleedit.php
index 5c3630a910..c82cd0b3d0 100644
--- a/src/www/project/admin/roleedit.php
+++ b/src/www/project/admin/roleedit.php
@@ -142,7 +142,7 @@ if ($role_id=='observer') {
 	} else {
 		$title= _('Edit Role');
 	}
-	$msg = _('Use this page to edit the permissions attached to each role.  Note that each role has at least as much access as the Anonymous and LoggedIn roles.  For example, if the the Anonymous role has read access to a forum, all other roles will have it too.');
+	$msg = _('Use this page to edit the permissions attached to each role.  Note that each role has at least as much access as the Anonymous and LoggedIn roles.  For example, if the Anonymous role has read access to a forum, all other roles will have it too.');
 }
 
 project_admin_header(array('title'=> $title,'group'=>$group_id));
-- 
2.30.2