diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-24 07:34:32 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-24 07:34:32 +0000 |
| commit | 54272ab0899836e569d44d6fc88421112c15a6c9 (patch) | |
| tree | 37827c816b2384eaa9893b56e920023cbff48769 | |
| parent | 8712095f0e885bdccbf168e1d6485b0d1a13a7fc (diff) | |
- Fix possible infinite redirect on attachment preview (#1488199)
git-svn-id: https://svn.roundcube.net/trunk@5479 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/get.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index a63ed7161..8691b57ef 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix possible infinite redirect on attachment preview (#1488199) - Improved clickjacking protection for browsers which don't support X-Frame-Options headers - Fixed bug where similiar folder names were highlighted wrong (#1487860) - Fixed bug in handling link with '!' character in it (#1488195) diff --git a/roundcubemail/program/steps/mail/get.inc b/roundcubemail/program/steps/mail/get.inc index d4dcd0a84..828f8debc 100644 --- a/roundcubemail/program/steps/mail/get.inc +++ b/roundcubemail/program/steps/mail/get.inc @@ -22,7 +22,7 @@ // show loading page if (!empty($_GET['_preload'])) { - $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']); + $url = preg_replace('/[&?]+_preload=1/', '', $_SERVER['REQUEST_URI']); $message = rcube_label('loadingdata'); header('Content-Type: text/html; charset=' . RCMAIL_CHARSET); |