diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-01-16 09:02:37 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-01-16 09:02:37 +0100 |
commit | 531c4d896c6fda2e979e219633078c95b95d83c0 (patch) | |
tree | 586c270eef37be0f8f215ebc808bfd0c00cec44f /program/lib/Roundcube/rcube_plugin.php | |
parent | d924ebebf752bd694dc171c1ea259c9b77dcb405 (diff) | |
parent | c5f63527101bb20f4c11377f09b53bd406a72714 (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube/rcube_plugin.php')
-rw-r--r-- | program/lib/Roundcube/rcube_plugin.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php index 0dd575a96..f0af95332 100644 --- a/program/lib/Roundcube/rcube_plugin.php +++ b/program/lib/Roundcube/rcube_plugin.php @@ -133,15 +133,8 @@ abstract class rcube_plugin return false; } 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)) { - 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 $rcube->config->load_from_file($this->ID . '.inc.php'); } return true; |