summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-03-11 17:04:49 +0100
committerAleksander Machniak <alec@alec.pl>2015-03-11 17:04:49 +0100
commit27da86be48926e0bb3af3cc5f6fdf020bdacd045 (patch)
tree09f2f58ad6a59cac3c12b4b5e8c25de3403d2995 /program
parentb0bb38703e73794a924949effe6df5d8dfd106a0 (diff)
parent5def0d8e9ebb698f3622d97ebdd2c51b2748c773 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_plugin_api.php2
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 9bc60f639..ce727e2e7 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -212,7 +212,7 @@ class rcube_plugin_api
if ($plugin = $this->plugins[$plugin_name]) {
// init a plugin only if $force is set or if we're called after initialization
- if (($force || $this->initialized) && !$this->plugins_initialized[$plugin_name] && !$this->filter($plugin)) {
+ if (($force || $this->initialized) && !$this->plugins_initialized[$plugin_name] && ($force || !$this->filter($plugin))) {
$plugin->init();
$this->plugins_initialized[$plugin_name] = $plugin;
}