Roundcubemail devel
parent: f9c8e828 | patch | commit | ignore whitespace
Thomas Bruederli
2013-11-16 fa635d886276cc33ab3ae67d852ec93954e2613a 
Make $force parameter only override the task check for required plugins (#1489437)
1 files modified
2 ■■■■■ changed files
program/lib/Roundcube/rcube_plugin_api.php 2 ●●●●● patch | view | raw | blame | history 
 program/lib/Roundcube/rcube_plugin_api.php


@@ -198,7 +198,7 @@


                // 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']))


                    ) {