Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2014-04-10 eddaf0b5f68c9863181b62db33bc468d38071e8a

 program/lib/Roundcube/rcube_plugin.php

@@ -109,7 +109,7 @@
     */
    public function require_plugin($plugin_name)
    {
        return $this->api->load_plugin($plugin_name);
        return $this->api->load_plugin($plugin_name, true);
    }

    /**
@@ -125,13 +125,17 @@
        $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 if (!$is_local) {
            // Search plugin_name.inc.php file in any configured path
            return $rcube->config->load_from_file($this->ID . '.inc.php');
        }

        return true;
    }