From 3ad2b1b4b0ac0fc7a6c7a5adaad9a0616b890daf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 24 Nov 2011 02:53:00 -0500
Subject: [PATCH] - Applied fixes from trunk up to r5479
---
program/steps/mail/get.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index d4dcd0a..828f8de 100644
--- a/program/steps/mail/get.inc
+++ b/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);
--
Gitblit v1.9.1