projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4be1601
)
If a particular permission bit isn't recorded for a role, and the role's name matches...
author
Roland Mas
<lolando@debian.org>
Mon, 29 Mar 2010 14:30:42 +0000
(14:30 +0000)
committer
Roland Mas
<lolando@debian.org>
Mon, 29 Mar 2010 14:30:42 +0000
(14:30 +0000)
gforge/common/include/Role.class.php
patch
|
blob
|
history
diff --git
a/gforge/common/include/Role.class.php
b/gforge/common/include/Role.class.php
index 8e0f9616c68649e2d34febc3c38f4c56f3f037f6..dfc75ef88b16d3fda059f306c8d0445b6d67da4f 100644
(file)
--- a/
gforge/common/include/Role.class.php
+++ b/
gforge/common/include/Role.class.php
@@
-276,6
+276,9
@@
class Role extends Error {
foreach ($arr as $section) {
if (array_key_exists ($section, $this->setting_array)) {
$new_sa[$section][0] = $this->setting_array[$section][0] ;
+ } elseif (array_key_exists ($this->data_array['role_name'], $this->defaults
+ && array_key_exists ($section, $this->defaults[$this->data_array['role_name']])) {
+ $new_sa[$section][0] = $this->defaults[$this->data_array['role_name']][$section] ;
} else {
$new_sa[$section][0] = 0 ;
}