diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-06-30 02:05:54 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-06-30 02:05:54 -0700 |
| commit | 0a16cff14790717c0302a1f1d34062ddc2f59d21 (patch) | |
| tree | 0d4ecce722071953aab4644347f7420c380470f6 /lib/plugins/acl | |
| parent | 4d053d04448a73826574eeb5e6be7e4d53c38ae6 (diff) | |
| parent | 11f03531585cccac387161ba88f54a28bad5624b (diff) | |
| download | rpg-0a16cff14790717c0302a1f1d34062ddc2f59d21.tar.gz rpg-0a16cff14790717c0302a1f1d34062ddc2f59d21.tar.bz2 | |
Merge pull request #111 from splitbrain/groupwildcard
Groupwildcard
Diffstat (limited to 'lib/plugins/acl')
| -rw-r--r-- | lib/plugins/acl/admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index c3461b78b..1f88c6ff9 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -84,7 +84,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $this->who = '@'.ltrim($auth->cleanGroup($who),'@'); }elseif($_REQUEST['acl_t'] == '__u__' && $who){ $this->who = ltrim($who,'@'); - if($this->who != '%USER%'){ #keep wildcard as is + if($this->who != '%USER%' && $this->who != '%GROUP%'){ #keep wildcard as is $this->who = $auth->cleanUser($this->who); } }elseif($_REQUEST['acl_t'] && @@ -140,7 +140,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if ($who!='@ALL') { $who = '@'.ltrim($auth->cleanGroup($who),'@'); } - } elseif ($who != '%USER%'){ #keep wildcard as is + } elseif ($who != '%USER%' && $who != '%GROUP%'){ #keep wildcard as is $who = $auth->cleanUser($who); } $who = auth_nameencode($who,true); |