summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-12-25 08:33:21 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-12-25 08:33:21 +0000
commitff0a1bced5567acd1de5096612df16ab9bd3d936 (patch)
treecc36ccd28dd225e936f6a7f81d9abb7957353e99 /roundcubemail/program
parentd8f9dfdbc04b3fb1b85122a31ff3c81e85fa6791 (diff)
- fix imap::set_options()
git-svn-id: https://svn.roundcube.net/trunk@2189 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_imap.php2
1 files changed, 1 insertions, 1 deletions
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);
}
/**