summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-04-02 16:26:59 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-04-02 16:26:59 +0200
commit509a6bc36882a9ed176ccc67ad0fc414093a44d9 (patch)
tree57228cafb1dd50a3079769a108e66a4413db19ff
parent688fd769400984f99c4727b0283b227df7a2121b (diff)
Allow to force-load plugins which have been loaded but not initialized before
-rw-r--r--program/lib/Roundcube/rcube_plugin_api.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 461c3cc07..feeeb192e 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -182,7 +182,7 @@ class rcube_plugin_api
}
// plugin already loaded
- if ($this->plugins[$plugin_name] || class_exists($plugin_name, false)) {
+ if ($this->plugins[$plugin_name]) {
return true;
}
@@ -190,7 +190,9 @@ class rcube_plugin_api
. DIRECTORY_SEPARATOR . $plugin_name . '.php';
if (file_exists($fn)) {
- include $fn;
+ if (!class_exists($plugin_name, false)) {
+ include $fn;
+ }
// instantiate class if exists
if (class_exists($plugin_name, false)) {