Merge pull request #160 from Takika/patch-1

Thomas B.

2014-01-14 5991988b9a54a17c90bf5a6583064f71eaca9186

Merge pull request #160 from Takika/patch-1

Load plugin config file (by plugin name) from any configured path

 program/lib/Roundcube/rcube_plugin.php

@@ -131,6 +131,16 @@
                'file' => __FILE__, 'line' => __LINE__,
                'message' => "Failed to load config from $fpath"), true, false);
            return false;
        } else {
            $fname = $this->ID . '.inc.php';
            // Search plugin_name.inc.php file in any configured path
            if (!$rcube->config->load_from_file($fname)) {
                rcube::raise_error(array(
                    'code' => 527, 'type' => 'php',
                    'file' => __FILE__, 'line' => __LINE__,
                    'message' => "Failed to load $fname config file from any configured path"), true, false);
                return false;
            }
        }

        return true;