summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-03-11 16:35:29 +0100
committerThomas Bruederli <bruederli@kolabsys.com>2015-03-11 16:47:28 +0100
commit5def0d8e9ebb698f3622d97ebdd2c51b2748c773 (patch)
tree7d501a0979d41db7b6153b5cf4b11529f20d20f5 /program
parentdb71156ab26ed3b60445aa2865f9606ec4515944 (diff)
Ignore plugin loading filter if force parameter is set
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;
}