diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-10-28 04:27:44 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-10-28 04:27:44 -0700 |
| commit | 1a3aae1d461842aa814160e5e1b13b1ab9116c8a (patch) | |
| tree | 7858ec5f9d737a83539c32a24c44b45756dbf757 /lib/plugins/acl | |
| parent | 0f91b38c17dcd12ce5b73ad8312851f67244b080 (diff) | |
| parent | 30eae85545994c10dcacb2d7becceaf569c99f65 (diff) | |
| download | rpg-1a3aae1d461842aa814160e5e1b13b1ab9116c8a.tar.gz rpg-1a3aae1d461842aa814160e5e1b13b1ab9116c8a.tar.bz2 | |
Merge pull request #395 from splitbrain/FS#2867
FS#2867, ACL processing may fail with utf-8 characters which include byte 'A0'.
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 5ab73670d..b24981d91 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -554,7 +554,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $line = trim(preg_replace('/#.*$/','',$line)); //ignore comments if(!$line) continue; - $acl = preg_split('/\s+/',$line); + $acl = preg_split('/[ \t]+/',$line); //0 is pagename, 1 is user, 2 is acl $acl[1] = rawurldecode($acl[1]); @@ -701,7 +701,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $acl_config = file($config_cascade['acl']['default']); $acl_user = auth_nameencode($acl_user,true); - $acl_pattern = '^'.preg_quote($acl_scope,'/').'\s+'.$acl_user.'\s+[0-8].*$'; + $acl_pattern = '^'.preg_quote($acl_scope,'/').'[ \t]+'.$acl_user.'[ \t]+[0-8].*$'; // save all non!-matching $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT); |