diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-03-10 11:49:20 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-03-10 11:49:20 +0100 |
| commit | 8b771646fadcde0abb27c2218a45942b95734838 (patch) | |
| tree | 8c438cdc684cac4a0c03c123a7eb2e2fc2026ca2 /program/lib/Roundcube | |
| parent | 507876cf038f87953702e34596d14d7f57666ccd (diff) | |
Fix so task name can really contain all from a-z0-9_- characters (#1488941)
Diffstat (limited to 'program/lib/Roundcube')
| -rw-r--r-- | program/lib/Roundcube/rcube_plugin.php | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_plugin_api.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php index 66e77cce2..9ea0f73d3 100644 --- a/program/lib/Roundcube/rcube_plugin.php +++ b/program/lib/Roundcube/rcube_plugin.php @@ -237,7 +237,7 @@ abstract class rcube_plugin /** * Register this plugin to be responsible for a specific task * - * @param string $task Task name (only characters [a-z0-9_.-] are allowed) + * @param string $task Task name (only characters [a-z0-9_-] are allowed) */ public function register_task($task) { diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php index 8a4cce215..111c177d9 100644 --- a/program/lib/Roundcube/rcube_plugin_api.php +++ b/program/lib/Roundcube/rcube_plugin_api.php @@ -372,7 +372,7 @@ class rcube_plugin_api /** * Register this plugin to be responsible for a specific task * - * @param string $task Task name (only characters [a-z0-9_.-] are allowed) + * @param string $task Task name (only characters [a-z0-9_-] are allowed) * @param string $owner Plugin name that registers this action */ public function register_task($task, $owner) @@ -382,7 +382,7 @@ class rcube_plugin_api return true; } - if ($task != asciiwords($task)) { + if ($task != asciiwords($task, true)) { rcube::raise_error(array('code' => 526, 'type' => 'php', 'file' => __FILE__, 'line' => __LINE__, 'message' => "Invalid task name: $task." |