From aa581c2912fa291c59605d876a6b37241a6a8b06 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 14 Jan 2014 17:04:24 +0100 Subject: Fall back to load plugin config from global config directories only if no local config file exists --- program/lib/Roundcube/rcube_plugin.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'program/lib/Roundcube/rcube_plugin.php') diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php index a571609f1..0dd575a96 100644 --- a/program/lib/Roundcube/rcube_plugin.php +++ b/program/lib/Roundcube/rcube_plugin.php @@ -125,13 +125,14 @@ abstract class rcube_plugin $fpath = $this->home.'/'.$fname; $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( 'code' => 527, 'type' => 'php', 'file' => __FILE__, 'line' => __LINE__, 'message' => "Failed to load config from $fpath"), true, false); return false; - } else { + } + else if (!$is_local) { $fname = $this->ID . '.inc.php'; // Search plugin_name.inc.php file in any configured path if (!$rcube->config->load_from_file($fname)) { -- cgit v1.2.3