diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-04-03 13:08:14 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-04-03 13:08:14 +0200 |
commit | 6201aaf1cde2a0cb83a9f6b20899cd769b43a762 (patch) | |
tree | c915d06d2cee59480bfd26651dc2f5798f57c947 /program/lib/Roundcube/rcube_plugin_api.php | |
parent | 81ce7ec252d9f72291bc585294c2c83636c9dd74 (diff) | |
parent | 62e618bd1735881b6d80ad5570336d084f3d6999 (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube/rcube_plugin_api.php')
-rw-r--r-- | program/lib/Roundcube/rcube_plugin_api.php | 6 |
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)) { |