diff options
| author | alecpl <alec@alec.pl> | 2011-08-31 12:49:44 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-08-31 12:49:44 +0000 |
| commit | b08caf5813c43e8648cdf5db1e003b3046a37c2c (patch) | |
| tree | e87f3c8cd0802c550459f26de1473bbcd4107131 /program/include/rcube_plugin_api.php | |
| parent | fd6146b6780c526a04682cda89b133e2d9bbd910 (diff) | |
- Applied fixes from trunk up to r5150
Diffstat (limited to 'program/include/rcube_plugin_api.php')
| -rw-r--r-- | program/include/rcube_plugin_api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php index cfba7fa78..0e38a3101 100644 --- a/program/include/rcube_plugin_api.php +++ b/program/include/rcube_plugin_api.php @@ -176,7 +176,7 @@ class rcube_plugin_api if (is_subclass_of($plugin, 'rcube_plugin')) { // ... task, request type and framed mode if ((!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $rcmail->task)) - && (!$plugin->noajax || is_a($rcmail->output, 'rcube_template')) + && (!$plugin->noajax || (is_object($rcmail->output) && is_a($rcmail->output, 'rcube_template'))) && (!$plugin->noframe || empty($_REQUEST['_framed'])) ) { $plugin->init(); |