diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix login in case when default_host is an array with one element (#1488928) - Use LDAP fallback hosts on connect + bind instead of ldap_connect() only. - Add config option for LDAP bind timeout (sets LDAP_OPT_NETWORK_TIMEOUT option) - Submit Addressbook advanced search form with Enter key (#1488568) diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index d4a1654f1..cd5f4dddc6 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -1550,10 +1550,10 @@ class rcmail_output_html extends rcmail_output } } } - else if (is_array($default_host) && ($host = array_pop($default_host))) { + else if (is_array($default_host) && ($host = key($default_host)) !== null) { $hide_host = true; $input_host = new html_hiddenfield(array( - 'name' => '_host', 'id' => 'rcmloginhost', 'value' => $host) + $attrib); + 'name' => '_host', 'id' => 'rcmloginhost', 'value' => is_numeric($host) ? $default_host[$host] : $host) + $attrib); } else if (empty($default_host)) { $input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost') |