diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2014-05-12 17:05:53 +0200 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2014-05-12 17:05:53 +0200 |
commit | b693dcf4e3981425df7b3cda504cab3966d32ebe (patch) | |
tree | cb05dec92cedb623a9737aa6290fd324b01e4d3a /index.php | |
parent | 5983ba959db52d232a074414cbb781a784ca916f (diff) | |
parent | 618318ba036f083071182e49170abd1b96dd8ba8 (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -211,7 +211,7 @@ if (empty($RCMAIL->user->ID)) { $OUTPUT->show_message('sessionerror', 'error', null, true, -1); } - if ($OUTPUT->ajax_call || !empty($_REQUEST['_framed'])) { + if ($OUTPUT->ajax_call || $OUTPUT->framed) { $OUTPUT->command('session_error', $RCMAIL->url(array('_err' => 'session'))); $OUTPUT->send('iframe'); } |