diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2015-03-12 16:27:14 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2015-03-12 16:27:14 +0100 |
| commit | b1d13e8bd5c550fff9f3e0768fa33a2b3b3668f3 (patch) | |
| tree | 01df975c4a9fec72820cb38e7af08d4dbf566740 /program | |
| parent | 731330cf340266c8a5812634e180b245fd74a106 (diff) | |
Fix redirct URL for attachments loaded in an iframe (#1490191)
Diffstat (limited to 'program')
| -rw-r--r-- | program/steps/mail/get.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index cb4f58027..831026eb7 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -22,7 +22,9 @@ // show loading page if (!empty($_GET['_preload'])) { - $url = preg_replace('/([&?]+)_preload=/', '\\1_mimewarning=1&_embed=', $_SERVER['REQUEST_URI']); + $_get = $_GET + array('_mimewarning' => 1, '_embed' => 1); + unset($_get['_preload']); + $url = $RCMAIL->url($_get); $message = $RCMAIL->gettext('loadingdata'); header('Content-Type: text/html; charset=' . RCUBE_CHARSET); |