- fix loading required plugins (#1486079)

release-0.6
alecpl 15 years ago
parent 57307bc782
commit 912bbbc20e

@ -118,15 +118,17 @@ class rcube_plugin_api
if (!$loaded) { if (!$loaded) {
$fn = $plugins_dir->path . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php'; $fn = $plugins_dir->path . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
if (file_exists($fn)) { if (file_exists($fn)) {
include($fn); include_once($fn);
if (class_exists($plugin_name, false)) { if (class_exists($plugin_name, false)) {
$plugin = new $plugin_name($this); $plugin = new $plugin_name($this);
// check inheritance // check inheritance
if (is_subclass_of($plugin, 'rcube_plugin')) { if (is_subclass_of($plugin, 'rcube_plugin')) {
$plugin->init(); if (!$plugin->task || preg_match('/('.$plugin->task.')/i', $rcmail->task)) {
$this->plugins[] = $plugin; $plugin->init();
$loaded = true; $this->plugins[] = $plugin;
}
$loaded = true;
} }
} }
} }

Loading…
Cancel
Save