Thomas Bruederli
2014-01-14 aa581c2912fa291c59605d876a6b37241a6a8b06
Fall back to load plugin config from global config directories only if no local config file exists
1 files modified
5 ■■■■■ changed files
program/lib/Roundcube/rcube_plugin.php 5 ●●●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube_plugin.php
@@ -125,13 +125,14 @@
        $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)) {