summaryrefslogtreecommitdiff
path: root/program/include/rcube_plugin.php
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2010-02-18 18:01:53 +0000
committerthomascube <thomas@roundcube.net>2010-02-18 18:01:53 +0000
commitb545d3e8388d18a64d50b6f7879804cf4e7812ca (patch)
tree2f77722307e65126464f77de9cd6e8ec5ed7dbad /program/include/rcube_plugin.php
parent030db5b6c0489158b5a4cf1ab6d2542db0519de8 (diff)
Fix loading of plugin configs: user prefs will always survive (#1486368)
Diffstat (limited to 'program/include/rcube_plugin.php')
-rw-r--r--program/include/rcube_plugin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index c5eb88439..8001c4cff 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -59,7 +59,7 @@ abstract class rcube_plugin
{
$fpath = $this->home.'/'.$fname;
$rcmail = rcmail::get_instance();
- if (is_file($fpath) && !$rcmail->config->load_from_file($fpath, false)) {
+ if (is_file($fpath) && !$rcmail->config->load_from_file($fpath)) {
raise_error(array('code' => 527, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load config from $fpath"), true, false);