From 4831da091754949e841511fd1401aab72d56ae49 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 17 Mar 2009 07:53:25 -0600 Subject: [PATCH] Fix server selection on reload --- imp/login.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imp/login.php b/imp/login.php index 8799007ad..db7b0384c 100644 --- a/imp/login.php +++ b/imp/login.php @@ -155,7 +155,7 @@ if ($show_list) { $isAuth = Auth::isAuthenticated(); foreach ($servers as $key => $val) { $entry = array( - 'sel' => IMP_Session::isPreferredServer($val, $key), + 'sel' => ($server_key == $key) || IMP::isPreferredServer($val, $key), 'val' => $key, 'name' => $val['name'] ); @@ -329,7 +329,7 @@ require IMP_TEMPLATES . '/common-header.inc'; $charset = NLS::getCharset(); IMP::addInlineScript(array( - 'ImpLogin.autologin_url = ' . Horde_Serialize::serialize(Util::addParameter(Horde::selfUrl(), array('autologin' => $autologin, 'server_key' => '')), Horde_Serialize::JSON, $charset), + 'ImpLogin.autologin_url = ' . Horde_Serialize::serialize(Util::addParameter(Horde::selfUrl(), array('autologin' => $autologin, 'server_key' => ''), null, false), Horde_Serialize::JSON, $charset), 'ImpLogin.ie_clientcaps = ' . intval($t->get('ie_clientcaps')), 'ImpLogin.imp_auth = ' . intval($imp_auth), 'ImpLogin.lang_url = ' . Horde_Serialize::serialize($lang_url, Horde_Serialize::JSON, $charset), -- 2.11.0