Fix loading of plugin configs: user prefs will always survive (#1486368)

thomascube

2010-02-18 b545d3e8388d18a64d50b6f7879804cf4e7812ca

 program/include/rcube_user.php

@@ -16,7 +16,7 @@
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id: rcube_user.inc 933 2007-11-29 14:17:32Z thomasb $
 $Id$

*/

@@ -123,7 +123,7 @@

    $this->language = $_SESSION['language'];
    if ($this->db->affected_rows()) {
      $config->merge($a_user_prefs);
      $config->set_user_prefs($a_user_prefs);
      return true;
    }