diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 23:32:15 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 23:32:15 +0100 |
| commit | 21c3090a76ebde3117ae1dcb9f503fe3a61c1c02 (patch) | |
| tree | ea4027081b22b3ab90a5d31d5ad1f0fdb0da28fa /lib/plugins | |
| parent | fa457f5d82989812f1961cb9643c0b55824ba0b3 (diff) | |
| download | rpg-21c3090a76ebde3117ae1dcb9f503fe3a61c1c02.tar.gz rpg-21c3090a76ebde3117ae1dcb9f503fe3a61c1c02.tar.bz2 | |
replace \s, \S with [ \t], [^ \t] in regexs used with acls
Diffstat (limited to 'lib/plugins')
| -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); |