From b545d3e8388d18a64d50b6f7879804cf4e7812ca Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Feb 2010 13:01:53 -0500
Subject: [PATCH] Fix loading of plugin configs: user prefs will always survive (#1486368)

---
 program/include/rcube_plugin.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index c5eb884..8001c4c 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -59,7 +59,7 @@
   {
     $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);

--
Gitblit v1.9.1