summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-02-24 11:38:22 +0100
committerAleksander Machniak <alec@alec.pl>2015-02-24 11:38:22 +0100
commit75e8a7d31352770ed029286e1e1b7bdb64311da9 (patch)
tree276231306e3ff78d76e7e57484280a238bc733b3 /program/lib/Roundcube
parent4d90e6596dfd7b7e2d0a3155667632bf0f42750b (diff)
Really make sure plugins aren't initialized twice
Diffstat (limited to 'program/lib/Roundcube')
-rw-r--r--program/lib/Roundcube/rcube_plugin_api.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 1a10b8de2..9bc60f639 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -95,7 +95,7 @@ class rcube_plugin_api
foreach ($this->plugins as $plugin) {
// ... task, request type and framed mode
- if (!$this->filter($plugin)) {
+ if (!$this->plugins_initialized[$plugin_name] && !$this->filter($plugin)) {
$plugin->init();
$this->plugins_initialized[$plugin->ID] = $plugin;
}
@@ -132,7 +132,7 @@ class rcube_plugin_api
// load required core plugin if no derivate was found
if (!$loaded) {
- $loaded = $this->load_plugin($plugin_name, true);
+ $loaded = $this->load_plugin($plugin_name);
}
// trigger fatal error if still not loaded