summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_plugin.php
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-02-18 18:01:53 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-02-18 18:01:53 +0000
commitcbd625bb31ff6db5c226c68bcc166ff8d5500f27 (patch)
treeaa4797205ce89feb8de1e4f5c8c46beab08257b0 /roundcubemail/program/include/rcube_plugin.php
parentee6c5ac95dab7ae6c51a32f9239493dcf61340f5 (diff)
Fix loading of plugin configs: user prefs will always survive (#1486368)
git-svn-id: https://svn.roundcube.net/trunk@3274 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_plugin.php')
-rw-r--r--roundcubemail/program/include/rcube_plugin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_plugin.php b/roundcubemail/program/include/rcube_plugin.php
index c5eb88439..8001c4cff 100644
--- a/roundcubemail/program/include/rcube_plugin.php
+++ b/roundcubemail/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);