diff options
| author | Michael Hamann <michael@content-space.de> | 2012-09-09 13:01:11 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2012-09-09 13:01:11 +0200 |
| commit | baf1d9a01127509f8f14cf4b6754a9eea0f1277a (patch) | |
| tree | 08ec28e4ba09986752bd5d5678965292c91096c3 /inc/plugincontroller.class.php | |
| parent | e9e762792aaa754e29c2ecbbd088b60f75b7d674 (diff) | |
| download | rpg-baf1d9a01127509f8f14cf4b6754a9eea0f1277a.tar.gz rpg-baf1d9a01127509f8f14cf4b6754a9eea0f1277a.tar.bz2 | |
Less restrictive plugin name checking
This partially reverts de50cad65ae679a602e71adddffdd74df7ea3fbb as the
strict check breaks existing plugins and this shouldn't be changed
without prior discussion and a warning for plugin authors with some time
to adjust their plugins. Now all characters that are valid in PHP class
names except "_" are allowed.
Diffstat (limited to 'inc/plugincontroller.class.php')
| -rw-r--r-- | inc/plugincontroller.class.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index 0d3080250..9d7b51e14 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -156,8 +156,9 @@ class Doku_Plugin_Controller { } else { $all_plugins[$plugin] = 1; } - if ($all_plugins[$plugin] == 1 && preg_match('/^[a-z0-9]+$/', $plugin) !== 1) { - msg(sprintf("Plugin name '%s' is not a valid plugin name, only the characters a-z and 0-9 are allowed.", hsc($plugin)), -1); + if ($all_plugins[$plugin] == 1 && preg_match('/^[a-zA-Z0-9\x7f-\xff]+$/', $plugin) !== 1) { + msg(sprintf("Plugin name '%s' is not a valid plugin name, only the characters a-z and 0-9 are allowed. ". + 'Maybe the plugin has been installed in the wrong directory?', hsc($plugin)), -1); } } $this->tmp_plugins = $all_plugins; |