|
|
@ -125,13 +125,14 @@ abstract class rcube_plugin
|
|
|
|
$fpath = $this->home.'/'.$fname;
|
|
|
|
$fpath = $this->home.'/'.$fname;
|
|
|
|
$rcube = rcube::get_instance();
|
|
|
|
$rcube = rcube::get_instance();
|
|
|
|
|
|
|
|
|
|
|
|
if (is_file($fpath) && !$rcube->config->load_from_file($fpath)) {
|
|
|
|
if (($is_local = is_file($fpath)) && !$rcube->config->load_from_file($fpath)) {
|
|
|
|
rcube::raise_error(array(
|
|
|
|
rcube::raise_error(array(
|
|
|
|
'code' => 527, 'type' => 'php',
|
|
|
|
'code' => 527, 'type' => 'php',
|
|
|
|
'file' => __FILE__, 'line' => __LINE__,
|
|
|
|
'file' => __FILE__, 'line' => __LINE__,
|
|
|
|
'message' => "Failed to load config from $fpath"), true, false);
|
|
|
|
'message' => "Failed to load config from $fpath"), true, false);
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (!$is_local) {
|
|
|
|
$fname = $this->ID . '.inc.php';
|
|
|
|
$fname = $this->ID . '.inc.php';
|
|
|
|
// Search plugin_name.inc.php file in any configured path
|
|
|
|
// Search plugin_name.inc.php file in any configured path
|
|
|
|
if (!$rcube->config->load_from_file($fname)) {
|
|
|
|
if (!$rcube->config->load_from_file($fname)) {
|
|
|
|