summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-01-16 08:50:07 +0100
committerThomas Bruederli <thomas@roundcube.net>2014-01-16 08:50:07 +0100
commitc5f63527101bb20f4c11377f09b53bd406a72714 (patch)
treef63729fc49aed4dffd34e7929844df268cb0f9d0 /program
parent8fc49e51a4e6c928e9aa741b3315ea61eee6b642 (diff)
Don't log error if no plugin config is found in global directories
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_plugin.php9
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;