summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_plugin.php
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-11-09 16:18:58 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-11-09 16:18:58 +0000
commitdefb54fd237ae638a468dc3a7250da30c8072e07 (patch)
treef2c300142eb1e2ea314016f0dcd56f3d0a84c29b /roundcubemail/program/include/rcube_plugin.php
parent0e4bcac74a6d7a32382250d908930b7e95f3efb2 (diff)
Plugins should not overwrite existing config props
git-svn-id: https://svn.roundcube.net/trunk@3102 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 ed30e8f17..cb5f8e256 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 (!$rcmail->config->load_from_file($fpath)) {
+ if (!$rcmail->config->load_from_file($fpath, false)) {
raise_error(array('code' => 527, 'type' => 'php', 'message' => "Failed to load config from $fpath"), true, false);
return false;
}