From fa635d886276cc33ab3ae67d852ec93954e2613a Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sat, 16 Nov 2013 15:49:25 +0100 Subject: Make $force parameter only override the task check for required plugins (#1489437) --- program/lib/Roundcube/rcube_plugin_api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program/lib/Roundcube/rcube_plugin_api.php') 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'])) ) { -- cgit v1.2.3