From b1d13e8bd5c550fff9f3e0768fa33a2b3b3668f3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 12 Mar 2015 16:27:14 +0100
Subject: Fix redirct URL for attachments loaded in an iframe (#1490191)

---
 program/steps/mail/get.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'program')

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);
-- 
cgit v1.2.3