From b693dcf4e3981425df7b3cda504cab3966d32ebe Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 12 May 2014 11:05:53 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
index.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/index.php b/index.php
index 239dc00..3674db1 100644
--- a/index.php
+++ b/index.php
@@ -211,7 +211,7 @@
$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');
}
--
Gitblit v1.9.1