Fix duplicate entry on timezones list in rcube_config::timezone_name_from_a...

Aleksander Machniak

2015-02-27 8defdaf0b1864f8e420be65823c0bf72426254cc

 index.php

@@ -2,9 +2,9 @@
/*
 +-------------------------------------------------------------------------+
 | Roundcube Webmail IMAP Client                                           |
 | Version 1.0-rc                                                          |
 | Version 1.0.5                                                           |
 |                                                                         |
 | Copyright (C) 2005-2013, The Roundcube Dev Team                         |
 | Copyright (C) 2005-2014, The Roundcube Dev Team                         |
 |                                                                         |
 | This program is free software: you can redistribute it and/or modify    |
 | it under the terms of the GNU General Public License (with exceptions   |
@@ -172,6 +172,7 @@

// end session (after optional referer check)
else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])
    && $RCMAIL->check_request(rcube_utils::INPUT_GET)
    && (!$RCMAIL->config->get('referer_check') || rcube_utils::check_referer())
) {
    $userdata = array(
@@ -211,7 +212,7 @@
        $OUTPUT->show_message('sessionerror', 'error', null, true, -1);
    }

    if ($OUTPUT->ajax_call || !empty($_REQUEST['_framed'])) {
    if ($OUTPUT->ajax_call || $OUTPUT->get_env('framed')) {
        $OUTPUT->command('session_error', $RCMAIL->url(array('_err' => 'session')));
        $OUTPUT->send('iframe');
    }