From 75e8a7d31352770ed029286e1e1b7bdb64311da9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 24 Feb 2015 05:38:22 -0500
Subject: [PATCH] Really make sure plugins aren't initialized twice
---
program/lib/Roundcube/rcube_plugin_api.php | 4 ++--
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 1a10b8d..9bc60f6 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -95,7 +95,7 @@
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 @@
// 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
--
Gitblit v1.9.1