diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-11-16 15:49:25 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-11-16 15:49:25 +0100 |
| commit | fa635d886276cc33ab3ae67d852ec93954e2613a (patch) | |
| tree | 702aebfa1f67f111b3b0507791de3da689dc1449 /program/lib/Roundcube/rcube_plugin_api.php | |
| parent | f9c8e8285b8e42342b48555f16c44ccb9f8ead26 (diff) | |
Make $force parameter only override the task check for required plugins (#1489437)
Diffstat (limited to 'program/lib/Roundcube/rcube_plugin_api.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_plugin_api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php index e6d186a6b..ad012552d 100644 --- a/program/lib/Roundcube/rcube_plugin_api.php +++ b/program/lib/Roundcube/rcube_plugin_api.php @@ -198,7 +198,7 @@ class rcube_plugin_api // check inheritance... if (is_subclass_of($plugin, 'rcube_plugin')) { // ... task, request type and framed mode - if ($force || (!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $this->task)) + if (($force || !$plugin->task || preg_match('/^('.$plugin->task.')$/i', $this->task)) && (!$plugin->noajax || (is_object($this->output) && $this->output->type == 'html')) && (!$plugin->noframe || empty($_REQUEST['_framed'])) ) { |