summaryrefslogtreecommitdiff
path: root/lib/plugins
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2011-04-16 11:54:47 +0200
committerAndreas Gohr <andi@splitbrain.org>2011-04-16 11:54:47 +0200
commit116065d2d8aa1613c8b90b01606efacc4fe846d1 (patch)
tree930af457c2e4c6fbc64c54d2def59b080a82e2e6 /lib/plugins
parent8dbd31e5a77929167c5dbba14c448c6acc0be95b (diff)
downloadrpg-116065d2d8aa1613c8b90b01606efacc4fe846d1.tar.gz
rpg-116065d2d8aa1613c8b90b01606efacc4fe846d1.tar.bz2
fix ACL preview for users with special chars FS#2206
The user was nameencoded twice.
Diffstat (limited to 'lib/plugins')
-rw-r--r--lib/plugins/acl/admin.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 3e7bd8121..8ca602533 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -17,7 +17,7 @@ if(!defined('DOKU_INC')) die();
class admin_plugin_acl extends DokuWiki_Admin_Plugin {
var $acl = null;
var $ns = null;
- /**
+ /**
* The currently selected item, associative array with id and type.
* Populated from (in this order):
* $_REQUEST['current_ns']
@@ -37,7 +37,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
return array(
'author' => 'Andreas Gohr',
'email' => 'andi@splitbrain.org',
- 'date' => '2010-01-17',
+ 'date' => '2011-04-16',
'name' => 'ACL Manager',
'desc' => 'Manage Page Access Control Lists',
'url' => 'http://dokuwiki.org/plugin:acl',
@@ -449,7 +449,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
$user = '';
$groups = array(ltrim($who,'@'));
}else{
- $user = auth_nameencode($who);
+ $user = $who;
$info = $auth->getUserData($user);
if($info === false){
$groups = array();
@@ -521,7 +521,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
}
// highlight?
- if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id']))
+ if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id']))
$cl = ' cur';
// namespace or page?