From ff0a1bced5567acd1de5096612df16ab9bd3d936 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 25 Dec 2008 08:33:21 +0000
Subject: - fix imap::set_options()

git-svn-id: https://svn.roundcube.net/trunk@2189 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_imap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 401bc8f7e..f378f2c9f 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -178,7 +178,7 @@ class rcube_imap
    */
   function set_options($opt)
   {
-    $this->options = array_merge((array)$opt, $this->options);
+    $this->options = array_merge($this->options, (array)$opt);
   }
 
   /**
-- 
cgit v1.2.3