diff options
| author | Gina Haeussge <gina@foosel.net> | 2010-06-26 13:29:02 +0200 |
|---|---|---|
| committer | Gina Haeussge <gina@foosel.net> | 2010-06-26 13:29:02 +0200 |
| commit | a992042bb4cc85fc90ec35a868ed14b3a3bfd7b7 (patch) | |
| tree | 9f88ca6ecf0131b4f77a795951030b3bcdd9ed39 /lib | |
| parent | 681a59b23795166231cfebc0da4d0d219d528795 (diff) | |
| parent | 345b1674b60537d4a68bce48f7cc106b771051c7 (diff) | |
| download | rpg-a992042bb4cc85fc90ec35a868ed14b3a3bfd7b7.tar.gz rpg-a992042bb4cc85fc90ec35a868ed14b3a3bfd7b7.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/acl/admin.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 1f666660c..673ffbc96 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -96,7 +96,10 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if($_REQUEST['acl_t'] == '__g__' && $who){ $this->who = '@'.ltrim($auth->cleanGroup($who),'@'); }elseif($_REQUEST['acl_t'] == '__u__' && $who){ - $this->who = ltrim($auth->cleanUser($who),'@'); + $this->who = ltrim($who,'@'); + if($this->who != '%USER%'){ #keep wildcard as is + $this->who = $auth->cleanUser($this->who); + } }elseif($_REQUEST['acl_t'] && $_REQUEST['acl_t'] != '__u__' && $_REQUEST['acl_t'] != '__g__'){ @@ -150,7 +153,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if ($who!='@ALL') { $who = '@'.ltrim($auth->cleanGroup($who),'@'); } - } else { + } elseif ($who != '%USER%'){ #keep wildcard as is $who = $auth->cleanUser($who); } $who = auth_nameencode($who,true); |