Allow rcube_plugin::task to be a regular expression defining several tasks (e.g. mail|settings)

git-svn-id: https://svn.roundcube.net/trunk@2628 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 1 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcube_plugin_api.php b/roundcubemail/program/include/rcube_plugin_api.php
index 5103ce156..52bbc40b5 100644
--- a/roundcubemail/program/include/rcube_plugin_api.php
+++ b/roundcubemail/program/include/rcube_plugin_api.php
@@ -89,7 +89,7 @@ class rcube_plugin_api
         if (class_exists($plugin_name, false)) {
           $plugin = new $plugin_name($this);
           // check inheritance and task specification
-          if (is_subclass_of($plugin, 'rcube_plugin') && (!$plugin->task || $plugin->task == $rcmail->task)) {
+          if (is_subclass_of($plugin, 'rcube_plugin') && (!$plugin->task || preg_match('/('.$plugin->task.')/i', $rcmail->task))) {
             $plugin->init();
             $this->plugins[] = $plugin;
           }